From d90a92a654063f6eaa83bba5d8b409d3dc2f6788 Mon Sep 17 00:00:00 2001 From: yujt Date: Fri, 12 Jun 2020 16:19:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BF=83=E7=90=86=E5=92=A8=E8=AF=A2pc=E7=AB=AF?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../psychology/dao/PsychologistDao.java | 10 ------- .../service/impl/PsychologistServiceImpl.java | 30 +++++++++++++++---- .../mapper/conflict/ConflictMediateDao.xml | 7 ++--- .../mapper/psychology/PsychologistDao.xml | 18 ++--------- 4 files changed, 28 insertions(+), 37 deletions(-) diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/dao/PsychologistDao.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/dao/PsychologistDao.java index 59b56a3..17b8165 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/dao/PsychologistDao.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/dao/PsychologistDao.java @@ -57,16 +57,6 @@ public interface PsychologistDao extends BaseDao { */ List listPsychiatrist(PsychologistFormDTO dto); - /** - * 心理咨询师注册检查 - * - * @return java.util.List - * @params [params] - * @author zhangyuan - * @since 2020/5/21 14:54 - */ - List checkPsychiatrist(PsychologistDTO dto); - /** * 心理咨询师详细 * diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/service/impl/PsychologistServiceImpl.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/service/impl/PsychologistServiceImpl.java index 8219bf1..0aa807e 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/service/impl/PsychologistServiceImpl.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/service/impl/PsychologistServiceImpl.java @@ -17,10 +17,13 @@ package com.elink.esua.epdc.modules.psychology.service.impl; +import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.elink.esua.epdc.commons.mybatis.enums.EpdcDelFlagEnum; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; +import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; @@ -105,18 +108,28 @@ public class PsychologistServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(); + wrapper.eq("USER_ID", userId) + .eq(FieldConstant.DEL_FLAG, EpdcDelFlagEnum.NORMAL.value()) + .ne(StringUtils.isNotBlank(psychologistId), FieldConstant.ID, psychologistId); + return baseDao.selectCount(wrapper) > NumConstant.ZERO; + } + @Override @Transactional(rollbackFor = Exception.class) public void save(PsychologistDTO dto) { - List check = baseDao.checkPsychiatrist(dto); - if (check.size() > 0) { + + if (isPsychologist(dto.getUserId(), null)) { throw new RenException("该用户已经注册心理咨询师"); } - List relation = dto.getTitles(); PsychologistEntity entity = ConvertUtils.sourceToTarget(dto, PsychologistEntity.class); int num = baseDao.insert(entity); - if (num > 0 && relation != null && relation.size() > 0) { + + List relation = dto.getTitles(); + if (num > NumConstant.ZERO && CollUtil.isNotEmpty(relation)) { relation.forEach(item -> { PsychologistTitleRelationEntity psychologistTitleRelationEntity = new PsychologistTitleRelationEntity(); psychologistTitleRelationEntity.setPsychologistId(entity.getId()); @@ -129,10 +142,15 @@ public class PsychologistServiceImpl extends BaseServiceImpl relation = dto.getTitles(); PsychologistEntity entity = ConvertUtils.sourceToTarget(dto, PsychologistEntity.class); - boolean updFlag = updateById(entity); - if (updFlag && relation != null && relation.size() > 0) { + + if (updateById(entity) && CollUtil.isNotEmpty(relation)) { psychologistTitleRelationDao.clearRelation(entity.getId()); relation.forEach(item -> { PsychologistTitleRelationEntity psychologistTitleRelationEntity = new PsychologistTitleRelationEntity(); diff --git a/epdc-cloud-property/src/main/resources/mapper/conflict/ConflictMediateDao.xml b/epdc-cloud-property/src/main/resources/mapper/conflict/ConflictMediateDao.xml index 7692f46..1819821 100644 --- a/epdc-cloud-property/src/main/resources/mapper/conflict/ConflictMediateDao.xml +++ b/epdc-cloud-property/src/main/resources/mapper/conflict/ConflictMediateDao.xml @@ -16,11 +16,8 @@ epdc_conflict_mediate WHERE DEL_FLAG = '0' - - AND find_in_set(#{grid},ALL_DEPT_IDS) - - - AND find_in_set(#{comm},ALL_DEPT_IDS) + + AND find_in_set(#{deptId},ALL_DEPT_IDS) AND SUBMIT_TIME > #{startTime} diff --git a/epdc-cloud-property/src/main/resources/mapper/psychology/PsychologistDao.xml b/epdc-cloud-property/src/main/resources/mapper/psychology/PsychologistDao.xml index 92aaa29..c13195f 100644 --- a/epdc-cloud-property/src/main/resources/mapper/psychology/PsychologistDao.xml +++ b/epdc-cloud-property/src/main/resources/mapper/psychology/PsychologistDao.xml @@ -29,7 +29,7 @@ SELECT FROM - epdc_psychologist + epdc_psychologist p WHERE DEL_FLAG = '0' @@ -38,21 +38,7 @@ AND MOBILE like CONCAT( '%', #{mobile}, '%' ) - ORDER BY - SORT ASC, - CREATED_TIME DESC - - -