Merge remote-tracking branch 'origin/dev_1118' into dev_1118

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/controller/EvaluateOfficerController.java

@@ -25,9 +25,9 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.dto.evaluate.EvaluateOfficerDTO;
 import com.elink.esua.epdc.modules.evaluate.excel.EvaluateOfficerExcel;
 import com.elink.esua.epdc.modules.evaluate.service.EvaluateOfficerService;
-import com.elink.esua.epdc.dto.evaluate.EvaluateOfficerDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -51,7 +51,8 @@ public class EvaluateOfficerController {
 
     @GetMapping("page")
     public Result<PageData<EvaluateOfficerDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<EvaluateOfficerDTO> page = evaluateOfficerService.page(params);
+        //PageData<EvaluateOfficerDTO> page = evaluateOfficerService.page(params);
+        PageData<EvaluateOfficerDTO> page = evaluateOfficerService.getOfficerPage(params);
         return new Result<PageData<EvaluateOfficerDTO>>().ok(page);
     }
 

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateOfficerDao.java

@@ -18,9 +18,13 @@
 package com.elink.esua.epdc.modules.evaluate.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.evaluate.EvaluateOfficerDTO;
 import com.elink.esua.epdc.modules.evaluate.entity.EvaluateOfficerEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 干部信息表 干部信息表
  *
@@ -29,5 +33,10 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface EvaluateOfficerDao extends BaseDao<EvaluateOfficerEntity> {
-	
+    /**
+     * 条件查询
+     * @param params
+     * @return
+     */
+    List<EvaluateOfficerDTO> getOfficerPage(Map<String, Object> params);
 }

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/EvaluateOfficerService.java

@@ -19,8 +19,8 @@ package com.elink.esua.epdc.modules.evaluate.service;
 
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
-import com.elink.esua.epdc.modules.evaluate.entity.EvaluateOfficerEntity;
 import com.elink.esua.epdc.dto.evaluate.EvaluateOfficerDTO;
+import com.elink.esua.epdc.modules.evaluate.entity.EvaluateOfficerEntity;
 
 import java.util.List;
 import java.util.Map;
@@ -43,6 +43,13 @@ public interface EvaluateOfficerService extends BaseService<EvaluateOfficerEntit
      */
     PageData<EvaluateOfficerDTO> page(Map<String, Object> params);
 
+    /**
+     * 分页条件查询
+     * @param params
+     * @return
+     */
+    PageData<EvaluateOfficerDTO> getOfficerPage(Map<String, Object> params);
+
     /**
      * 默认查询
      *

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateOfficerServiceImpl.java

@@ -23,11 +23,11 @@ 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.dto.evaluate.EvaluateOfficerDTO;
 import com.elink.esua.epdc.modules.evaluate.dao.EvaluateOfficerDao;
 import com.elink.esua.epdc.modules.evaluate.entity.EvaluateOfficerEntity;
 import com.elink.esua.epdc.modules.evaluate.redis.EvaluateOfficerRedis;
 import com.elink.esua.epdc.modules.evaluate.service.EvaluateOfficerService;
-import com.elink.esua.epdc.dto.evaluate.EvaluateOfficerDTO;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -58,6 +58,18 @@ public class EvaluateOfficerServiceImpl extends BaseServiceImpl<EvaluateOfficerD
         return getPageData(page, EvaluateOfficerDTO.class);
     }
 
+    /**
+     * 条件查询
+     * @param params
+     * @return
+     */
+    @Override
+    public PageData<EvaluateOfficerDTO> getOfficerPage(Map<String, Object> params) {
+        IPage<EvaluateOfficerDTO> page = getPage(params);
+        List<EvaluateOfficerDTO> list = baseDao.getOfficerPage(params);
+        return new PageData<>(list, page.getTotal());
+    }
+
     @Override
     public List<EvaluateOfficerDTO> list(Map<String, Object> params) {
         List<EvaluateOfficerEntity> entityList = baseDao.selectList(getWrapper(params));

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateOfficerDao.xml

@@ -20,5 +20,37 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
+    <select id="getOfficerPage" resultType="com.elink.esua.epdc.dto.evaluate.EvaluateOfficerDTO">
+        select
+        ID,
+        DEPT_ID,
+        FULL_NAME,
+        SEX,
+        POSITION,
+        LIKES_COUNT,
+        OPPOSE_COUNT,
+        SORT,
+        REVISION,
+        DEL_FLAG,
+        CREATED_BY,
+        CREATED_TIME,
+        UPDATED_BY,
+        UPDATED_TIME
+        from epdc_evaluate_officer
+        where DEL_FLAG = '0'
+        <if test="id != null and id != ''">
+            and ID like '%' #{id} '%'
+        </if>
+        <if test="deptId != null and deptId != ''">
+            and DEPT_ID = #{deptId}
+        </if>
+        <if test="fullName != null and fullName != ''">
+            and FULL_NAME like '%' #{fullName} '%'
+        </if>
+        <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+            AND DATE_FORMAT( CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
+        </if>
+        order by SORT, UPDATED_TIME desc
+    </select>
 
 </mapper>