数据抽取10，改为全量，心理师头衔等。

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);</sql>
+	AND find_in_set(${gridId}, i.ALL_DEPT_IDS);</sql>
     <limit>0</limit>
     <lookup/>
     <execute_each_row>N</execute_each_row>
@@ -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);</sql>
+	AND find_in_set(${gridId}, i.ALL_DEPT_IDS);</sql>
     <limit>0</limit>
     <lookup/>
     <execute_each_row>N</execute_each_row>
@@ -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);;</sql>
+AND find_in_set(${gridId}, u.ALL_DEPT_IDS);</sql>
     <limit>0</limit>
     <lookup/>
     <execute_each_row>N</execute_each_row>

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;
+
 /**
  * 心理咨询师头衔表
  *
@@ -30,4 +33,13 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface PsychologistTitleDao extends BaseDao<PsychologistTitleEntity> {
 
+    /**
+     * 咨询师列表
+     *
+     * @return java.util.List<com.elink.esua.epdc.modules.psychology.entity.PsychologistEntity>
+     * @params [params]
+     * @author zhangyuan
+     * @since 2020/5/21 14:54
+     */
+    List<PsychologistTitleEntity> selectListOfPsychologistTitle(Map<String, Object> params);
 }

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;
+
 /**
  * 心理咨询师头衔表
  *

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;
+
 }

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<PsychologistTi
 
     @Override
     public PageData<PsychologistTitleDTO> page(Map<String, Object> params) {
-        IPage<PsychologistTitleEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                getWrapper(params)
-        );
-        return getPageData(page, PsychologistTitleDTO.class);
+        IPage<PsychologistTitleEntity> page = getPage(params);
+        List<PsychologistTitleEntity> entityList = baseDao.selectListOfPsychologistTitle(params);
+        List<PsychologistTitleDTO> list = ConvertUtils.sourceToTarget(entityList, PsychologistTitleDTO.class);
+        return new PageData<>(list, page.getTotal());
     }
 
     @Override

epdc-cloud-property/src/main/resources/mapper/psychology/PsychologistDao.xml

@@ -35,7 +35,7 @@
         <if test="name != null and name != ''">
             AND NAME like CONCAT( '%', #{name}, '%' )
         </if>
-        <if test="mobile != null and policeNo != ''">
+        <if test="mobile != null and mobile != ''">
             AND MOBILE like CONCAT( '%', #{mobile}, '%' )
         </if>
         ORDER BY

epdc-cloud-property/src/main/resources/mapper/psychology/PsychologistTitleDao.xml

@@ -14,6 +14,24 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
-
-
+    <sql id="Base_Column_List">
+        ID,	TITLE,	CODE,	SORT,	DISPLAY_FLAG,	CREATED_BY,	CREATED_TIME,	UPDATED_BY,	UPDATED_TIME
+    </sql>
+    <select id="selectListOfPsychologistTitle" resultType="com.elink.esua.epdc.modules.psychology.entity.PsychologistTitleEntity">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM
+        epdc_psychologist_title
+        WHERE
+        DEL_FLAG = '0'
+        <if test="title != null and title != ''">
+            AND TITLE like CONCAT( '%', #{title}, '%' )
+        </if>
+        <if test="code != null and code != ''">
+            AND CODE like CONCAT( '%', #{code}, '%' )
+        </if>
+        ORDER BY
+        SORT ASC,
+        CREATED_TIME DESC
+    </select>
 </mapper>