疫情上报

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

@@ -40,8 +40,6 @@ public class EpidemicExcel {
     @Excel(name = "上报地点")
     private String address;
 
-    @Excel(name = "是否是网格党建指导员")
-    private String instructorFlag;
 
     @Excel(name = "上报内容")
     private String content;

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

@@ -61,14 +61,6 @@ public class EpidemicServiceImpl extends BaseServiceImpl<EpidemicDao, EpidemicEn
     }
     @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());

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

@@ -45,7 +45,6 @@
         epidemic.REPORTER,
         epidemic.MOBILE,
         epidemic.ADDRESS,
-        epidemic.INSTRUCTOR_FLAG,
         epidemic.CONTENT,
         epidemic.PARENT_DEPT_IDS,
         epidemic.PARENT_DEPT_NAMES,
@@ -64,9 +63,6 @@
         <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>