From 6fa4d2c2ce13ba9b62f47acd17321a0dee83ac9e Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 5 Jun 2020 15:30:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8A=BD=E5=8F=9610=EF=BC=8C?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=85=A8=E9=87=8F=EF=BC=8C=E5=BF=83=E7=90=86?= =?UTF-8?q?=E5=B8=88=E5=A4=B4=E8=A1=94=E7=AD=89=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../screen_totality_grid_query.ktr | 9 +++----- .../psychology/dao/PsychologistTitleDao.java | 14 +++++++++++- .../dao/PsychologistTitleRelationDao.java | 6 ++++- .../entity/PsychologistTitleEntity.java | 5 +++++ .../impl/PsychologistTitleServiceImpl.java | 13 +++++------ .../mapper/psychology/PsychologistDao.xml | 2 +- .../psychology/PsychologistTitleDao.xml | 22 +++++++++++++++++-- 7 files changed, 53 insertions(+), 18 deletions(-) diff --git a/epdc-cloud-property/doc/yushan-kettle/screen_totality_grid_query.ktr b/epdc-cloud-property/doc/yushan-kettle/screen_totality_grid_query.ktr index 93b5331..22352d4 100644 --- a/epdc-cloud-property/doc/yushan-kettle/screen_totality_grid_query.ktr +++ b/epdc-cloud-property/doc/yushan-kettle/screen_totality_grid_query.ktr @@ -701,8 +701,7 @@ FROM epdc_issue i WHERE i.DEL_FLAG = '0' - AND find_in_set(${gridId}, i.ALL_DEPT_IDS) - AND i.CREATED_TIME > DATE_SUB(CURDATE(), INTERVAL 1 DAY); + AND find_in_set(${gridId}, i.ALL_DEPT_IDS); 0 N @@ -812,8 +811,7 @@ FROM epdc_item i WHERE i.DEL_FLAG = '0' - AND find_in_set(${gridId}, i.ALL_DEPT_IDS) - AND i.CREATED_TIME > DATE_SUB(CURDATE(), INTERVAL 1 DAY); + AND find_in_set(${gridId}, i.ALL_DEPT_IDS); 0 N @@ -923,8 +921,7 @@ FROM epdc_user u WHERE u.DEL_FLAG = '0' -AND u.CREATED_TIME > DATE_SUB(CURDATE(), INTERVAL 1 DAY) -AND find_in_set(${gridId}, u.ALL_DEPT_IDS);; +AND find_in_set(${gridId}, u.ALL_DEPT_IDS); 0 N diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/dao/PsychologistTitleDao.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/dao/PsychologistTitleDao.java index 7bc58e2..b23fda5 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/dao/PsychologistTitleDao.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/dao/PsychologistTitleDao.java @@ -21,6 +21,9 @@ import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.modules.psychology.entity.PsychologistTitleEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; +import java.util.Map; + /** * 心理咨询师头衔表 * @@ -29,5 +32,14 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface PsychologistTitleDao extends BaseDao { - + + /** + * 咨询师列表 + * + * @return java.util.List + * @params [params] + * @author zhangyuan + * @since 2020/5/21 14:54 + */ + List selectListOfPsychologistTitle(Map params); } \ No newline at end of file diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/dao/PsychologistTitleRelationDao.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/dao/PsychologistTitleRelationDao.java index 257d455..cdd9a82 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/dao/PsychologistTitleRelationDao.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/dao/PsychologistTitleRelationDao.java @@ -18,9 +18,13 @@ package com.elink.esua.epdc.modules.psychology.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.modules.psychology.entity.PsychologistEntity; import com.elink.esua.epdc.modules.psychology.entity.PsychologistTitleRelationEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; +import java.util.Map; + /** * 心理咨询师头衔表 * @@ -29,5 +33,5 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface PsychologistTitleRelationDao extends BaseDao { - + } \ No newline at end of file diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/entity/PsychologistTitleEntity.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/entity/PsychologistTitleEntity.java index 6c431bd..557dedb 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/entity/PsychologistTitleEntity.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/entity/PsychologistTitleEntity.java @@ -46,4 +46,9 @@ public class PsychologistTitleEntity extends BaseEpdcEntity { */ private String code; + /** + * 排序 从小到大 + */ + private Integer sort; + } \ No newline at end of file diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/service/impl/PsychologistTitleServiceImpl.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/service/impl/PsychologistTitleServiceImpl.java index 0c7d9d1..2b5ff6a 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/service/impl/PsychologistTitleServiceImpl.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/service/impl/PsychologistTitleServiceImpl.java @@ -20,11 +20,11 @@ package com.elink.esua.epdc.modules.psychology.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; 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.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; -import com.elink.esua.epdc.commons.tools.constant.FieldConstant; -import com.elink.esua.epdc.modules.psychology.dao.PsychologistTitleDao; import com.elink.esua.epdc.dto.psychology.PsychologistTitleDTO; +import com.elink.esua.epdc.modules.psychology.dao.PsychologistTitleDao; import com.elink.esua.epdc.modules.psychology.entity.PsychologistTitleEntity; import com.elink.esua.epdc.modules.psychology.redis.PsychologistTitleRedis; import com.elink.esua.epdc.modules.psychology.service.PsychologistTitleService; @@ -51,11 +51,10 @@ public class PsychologistTitleServiceImpl extends BaseServiceImpl page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, PsychologistTitleDTO.class); + IPage page = getPage(params); + List entityList = baseDao.selectListOfPsychologistTitle(params); + List list = ConvertUtils.sourceToTarget(entityList, PsychologistTitleDTO.class); + return new PageData<>(list, page.getTotal()); } @Override 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 c3256ee..ffe9afe 100644 --- a/epdc-cloud-property/src/main/resources/mapper/psychology/PsychologistDao.xml +++ b/epdc-cloud-property/src/main/resources/mapper/psychology/PsychologistDao.xml @@ -35,7 +35,7 @@ AND NAME like CONCAT( '%', #{name}, '%' ) - + AND MOBILE like CONCAT( '%', #{mobile}, '%' ) ORDER BY diff --git a/epdc-cloud-property/src/main/resources/mapper/psychology/PsychologistTitleDao.xml b/epdc-cloud-property/src/main/resources/mapper/psychology/PsychologistTitleDao.xml index be71431..d600d66 100644 --- a/epdc-cloud-property/src/main/resources/mapper/psychology/PsychologistTitleDao.xml +++ b/epdc-cloud-property/src/main/resources/mapper/psychology/PsychologistTitleDao.xml @@ -14,6 +14,24 @@ - - + + ID, TITLE, CODE, SORT, DISPLAY_FLAG, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME + + \ No newline at end of file