补充新增加的excel字段

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/controller/EpidemicUserInfoController.java

@@ -2,6 +2,7 @@ package com.elink.esua.epdc.vaccine.epidemic.controller;
 
 
 import cn.afterturn.easypoi.excel.entity.ExportParams;
+import com.elink.esua.epdc.commons.mybatis.annotation.DataFilter;
 import com.elink.esua.epdc.commons.tools.annotation.LogOperation;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
@@ -45,6 +46,7 @@ public class EpidemicUserInfoController {
     private EpidemicUserInfoExportServer exportServer;
 
     @GetMapping("page")
+    @DataFilter(tableAlias = "hi", deptId = "grid_id", prefix = "and", isPendingCreator = false)
     public Result<PageData<EpidemicRecordListDTO>> page(@RequestParam Map<String, Object> params) {
         // 按人员往返时间倒序排列
         PageData<EpidemicRecordListDTO> page = epidemicUserInfoService.getPageList(params);

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/house/entity/PopulationInformationEntity.java

@@ -221,4 +221,6 @@ public class PopulationInformationEntity extends BaseEpdcEntity {
      * 接种状态 0未接种 1接种中 2接种完成
      */
     private Integer vaccinationState;
+
+    private String peopleCategories;
 }

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/house/excel/BasePopulationInformationExcel.java

@@ -153,4 +153,10 @@ public class BasePopulationInformationExcel {
     @Excel(name = "宠物犬状况",replace = {"无_0","有_1"})
     private String dogStatus;
 
+    @Excel(name = "特殊人群")
+    private String specialCrowd;
+
+    @Excel(name = "人口类型", replace = {"常驻_0", "男_1"})
+    private String peopleCategories;
+
 }

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/house/excel/BaseResidentInformationExcel.java

@@ -20,6 +20,8 @@ package com.elink.esua.epdc.vaccine.house.excel;
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * 人口信息表
  *
@@ -53,4 +55,22 @@ public class BaseResidentInformationExcel {
     @Excel(name = "现居住地")
     private String currentAddress;
 
+    @Excel(name = "特殊人群")
+    private String specialCrowd;
+
+    @Excel(name = "联系电话",width = 20)
+    private String residentsPhone;
+
+    @Excel(name = "政治面貌")
+    private String politicsStatus;
+
+    @Excel(name = "人口类型")
+    private String peopleCategories;
+
+    @Excel(name = "本人身份证号码")
+    private String selfIdentityNo;
+
+    private Date residentsBirthday;
+
+
 }

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/house/service/impl/HousingInformationServiceImpl.java

@@ -1296,7 +1296,7 @@ public class HousingInformationServiceImpl extends BaseServiceImpl<HousingInform
             if (StringUtils.isNotBlank(motorVehicleCategory)) {
                 //处理多选类型
                 String[] motorVehicleCategoryStrings = motorVehicleCategory.split(",");
-                Integer matchNum = 0;
+                int matchNum = 0;
                 String motorVehicleCategoryEnd = "";
                 for (String motorVehicleCategoryStr : Arrays.asList(motorVehicleCategoryStrings)) {
                     for (SysPopulationSimpleDictDTO sysPopulationSimpleDictDTO : sysPopulationSimpleDictDTOS) {
@@ -1382,6 +1382,8 @@ public class HousingInformationServiceImpl extends BaseServiceImpl<HousingInform
         entity.setFamilyMemberOutNum(informationEntity.getFamilyMemberOutNum());
         entity.setFamilyMemberOutMonth(informationEntity.getFamilyMemberOutMonth());
         entity.setFamilyMemberOutReason(informationEntity.getFamilyMemberOutReason());
+        entity.setSpecialCrowd(informationEntity.getSpecialCrowd());
+        entity.setPeopleCategories(informationEntity.getPeopleCategories());
         entity.setRelation(NumConstant.ONE_STR);
         entity.setLiveAddressName(informationEntity.getCurrentAddress());
         return entity;

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/house/service/impl/PopulationInformationServiceImpl.java

@@ -716,6 +716,8 @@ public class PopulationInformationServiceImpl extends BaseServiceImpl<Population
         entity.setFamilyMemberOutMonth(informationEntity.getFamilyMemberOutMonth());
         entity.setFamilyMemberOutReason(informationEntity.getFamilyMemberOutReason());
         entity.setLiveAddressName(informationEntity.getCurrentAddress());
+        entity.setSpecialCrowd(informationEntity.getSpecialCrowd());
+        entity.setPeopleCategories(informationEntity.getPeopleCategories());
         return entity;
     }
 }

epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoDao.xml

@@ -58,7 +58,8 @@
         ui.HOUSEHOLD_REGISTER_NAME householdRegisterName,
         if(ui.check_state='0','已检测','未检测') as checkStateName
         from epidemic_user_info ui
---         left join epidemic_user_inout_record uir on ui.ID_CARD=uir.ID_CARD and uir.DEL_FLAG='0'
+        LEFT JOIN epdc_house_resident hr on hr.RESIDENT_ID = ui.id
+        left join epdc_housing_information hi on hi.id = hr.HOUSE_ID and hi.DEL_FLAG='0'
         where ui.DEL_FLAG='0'
         <if test="checkState != null and checkState != '' and checkState== '0'.toString()">
             and ui.check_state = #{checkState}
@@ -140,7 +141,18 @@
         <if test="outLiveAddressName != null and outLiveAddressName.trim() != ''">
             and uir.OUT_LIVE_ADDRESS_NAME like '%${outLiveAddressName}%'
         </if>
---         GROUP BY ui.ID
+        <if test="streetId != '' and streetId != null">
+            AND (find_in_set(#{streetId},hi.PARENT_DEPT_IDS)
+            OR find_in_set(#{streetId},hi.ALL_DEPT_IDS))
+        </if>
+        <if test="communityId != '' and communityId != null">
+            AND (find_in_set(#{communityId},hi.PARENT_DEPT_IDS)
+            OR find_in_set(#{communityId},hi.ALL_DEPT_IDS))
+        </if>
+        <if test="gridId != '' and gridId != null">
+            and (hi.grid_id = #{gridId}
+            OR find_in_set(#{gridId},hi.ALL_DEPT_IDS))
+        </if>
         ORDER BY ui.UPDATED_TIME DESC
         <if test="excelBigDataPageSize != null and excelBigDataPageIndex != null">
             limit #{excelBigDataPageIndex},#{excelBigDataPageSize}