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

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/epidemic/controller/EpidemicController.java

@@ -52,7 +52,7 @@ public class EpidemicController {
 
     @GetMapping("page")
     public Result<PageData<EpidemicDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<EpidemicDTO> page = epidemicService.page(params);
+        PageData<EpidemicDTO> page = epidemicService.getEpidemicPageFromPc(params);
         return new Result<PageData<EpidemicDTO>>().ok(page);
     }
 

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/epidemic/dao/EpidemicDao.java

@@ -19,9 +19,13 @@ package com.elink.esua.epdc.modules.epidemic.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.EpidemicDTO;
 import com.elink.esua.epdc.modules.epidemic.entity.EpidemicEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 疫情管理表 疫情管理表
  *
@@ -30,5 +34,12 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface EpidemicDao extends BaseDao<EpidemicEntity>, BaseMapper<EpidemicEntity> {
-	
+    /**
+     * 报名列表
+     * @Params: [params]
+     * @Return: java.util.List<com.elink.esua.epdc.dto.heart.EpidemicDTO>
+     * @Author: liuchuang
+     * @Date: 2019/9/5 19:42
+     */
+    List<EpidemicDTO> getEpidemicPageFromPc(Map<String, Object> params);
 }

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/epidemic/excel/EpidemicExcel.java

@@ -31,9 +31,6 @@ import java.util.Date;
 @Data
 public class EpidemicExcel {
 
-    @Excel(name = "主键")
-    private String id;
-
     @Excel(name = "上报人")
     private String reporter;
 
@@ -43,41 +40,17 @@ public class EpidemicExcel {
     @Excel(name = "上报地点")
     private String address;
 
-    @Excel(name = "是否是网格党建指导员 0：否，1：是")
+    @Excel(name = "是否是网格党建指导员")
     private String instructorFlag;
 
     @Excel(name = "上报内容")
     private String content;
 
-    @Excel(name = "父所有部门ID")
-    private String parentDeptIds;
-
-    @Excel(name = "父所有部门名称")
-    private String parentDeptNames;
-
-    @Excel(name = "所有部门ID")
-    private String allDeptIds;
-
     @Excel(name = "所有部门名称")
     private String allDeptNames;
 
-    @Excel(name = "删除标识 0：否，1：是")
-    private String delFlag;
-
-    @Excel(name = "乐观锁")
-    private Integer revision;
-
-    @Excel(name = "创建人")
-    private String createdBy;
-
     @Excel(name = "创建时间")
     private Date createdTime;
 
-    @Excel(name = "更新人")
-    private String updatedBy;
-
-    @Excel(name = "更新时间")
-    private Date updatedTime;
-
 
 }

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/epidemic/service/EpidemicService.java

@@ -45,6 +45,8 @@ public interface EpidemicService extends BaseService<EpidemicEntity> {
      */
     PageData<EpidemicDTO> page(Map<String, Object> params);
 
+    PageData<EpidemicDTO> getEpidemicPageFromPc(Map<String, Object> params);
+
     /**
      * 默认查询
      *

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

@@ -59,6 +59,21 @@ public class EpidemicServiceImpl extends BaseServiceImpl<EpidemicDao, EpidemicEn
         );
         return getPageData(page, EpidemicDTO.class);
     }
+    @Override
+    public PageData<EpidemicDTO> getEpidemicPageFromPc(Map<String, Object> params) {
+        String status = params.get("instructorFlag").toString();
+        if("1".equals(status)) {
+            status = "1";
+            params.put("status",status);
+        } else if("2".equals(status)) {
+            status = "0";
+            params.put("status",status);
+        }
+        IPage<EpidemicDTO> page = getPage(params);
+        List<EpidemicDTO> list = baseDao.getEpidemicPageFromPc(params);
+        return new PageData<>(list, page.getTotal());
+    }
+
 
     @Override
     public List<EpidemicDTO> list(Map<String, Object> params) {

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/epidemic/EpidemicDao.xml

@@ -21,6 +21,73 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
+    <resultMap type="com.elink.esua.epdc.dto.EpidemicDTO" id="epidemicListMap">
+        <result property="id" column="ID"/>
+        <result property="reporter" column="REPORTER"/>
+        <result property="mobile" column="MOBILE"/>
+        <result property="address" column="ADDRESS"/>
+        <result property="instructorFlag" column="INSTRUCTOR_FLAG"/>
+        <result property="content" column="CONTENT"/>
+        <result property="parentDeptIds" column="PARENT_DEPT_IDS"/>
+        <result property="parentDeptNames" column="PARENT_DEPT_NAMES"/>
+        <result property="allDeptIds" column="ALL_DEPT_IDS"/>
+        <result property="allDeptNames" column="ALL_DEPT_NAMES"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+    <select id="getEpidemicPageFromPc" resultMap="epidemicListMap">
+        SELECT
+        epidemic.ID,
+        epidemic.REPORTER,
+        epidemic.MOBILE,
+        epidemic.ADDRESS,
+        epidemic.INSTRUCTOR_FLAG,
+        epidemic.CONTENT,
+        epidemic.PARENT_DEPT_IDS,
+        epidemic.PARENT_DEPT_NAMES,
+        epidemic.ALL_DEPT_IDS,
+        epidemic.ALL_DEPT_NAMES,
+        epidemic.DEL_FLAG,
+        epidemic.REVISION,
+        epidemic.CREATED_BY,
+        epidemic.CREATED_TIME,
+        epidemic.UPDATED_BY,
+        epidemic.UPDATED_TIME
+        FROM
+        epdc_epidemic epidemic
+        WHERE
+        epidemic.DEL_FLAG = '0'
+        <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+            AND DATE_FORMAT( epidemic.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
+        </if>
+        <if test="status != null">
+            AND epidemic.INSTRUCTOR_FLAG = #{status}
+        </if>
+        <if test="mobile != null and mobile != ''">
+            AND epidemic.MOBILE = #{mobile}
+        </if>
+        <if test="reporter != null and reporter != ''">
+            AND epidemic.REPORTER = #{reporter}
+        </if>
+        <if test="streetId != null and streetId != ''">
+            AND (find_in_set(#{streetId},epidemic.PARENT_DEPT_IDS)
+            OR find_in_set(#{streetId},epidemic.ALL_DEPT_IDS))
+        </if>
+        <if test="communityId != null and communityId != ''">
+            AND (find_in_set(#{communityId},epidemic.PARENT_DEPT_IDS)
+            OR find_in_set(#{communityId},epidemic.ALL_DEPT_IDS))
+        </if>
+        <if test="gridId != null and gridId != ''">
+            AND (find_in_set(#{gridId},epidemic.PARENT_DEPT_IDS)
+            OR find_in_set(#{gridId},epidemic.ALL_DEPT_IDS))
+        </if>
+        ORDER BY
+        epidemic.CREATED_TIME DESC
+    </select>
 
 
 </mapper>