From d425f7262c9c5c1ed04e9788630d0d4761eb85a7 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Mon, 13 Sep 2021 10:37:36 +0800
Subject: [PATCH] =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=AD=97=E6=AE=B5=E4=BB=A5=E5=8F=8A=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=A4=84=E7=90=86?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epidemic/dto/EpidemicRecordDetailDTO.java |  6 +-
 .../epidemic/dto/EpidemicRecordListDTO.java   |  1 -
 .../dto/result/EpidemicPageResultDTO.java     | 10 +++
 .../impl/HousingInformationServiceImpl.java   |  6 +-
 .../mapper/epidemic/EpidemicUserInfoDao.xml   | 71 ++++++++++---------
 5 files changed, 54 insertions(+), 40 deletions(-)

diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dto/EpidemicRecordDetailDTO.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dto/EpidemicRecordDetailDTO.java
index 710067b..f18205b 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dto/EpidemicRecordDetailDTO.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dto/EpidemicRecordDetailDTO.java
@@ -271,7 +271,9 @@ public class EpidemicRecordDetailDTO implements Serializable {
 	 * 居住情况
 	 */
 	private String livingSituation;
-
-
+	/**
+	 * 所属组织
+	 */
+	private String allDeptNames;
 
 }
\ No newline at end of file
diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dto/EpidemicRecordListDTO.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dto/EpidemicRecordListDTO.java
index cb16570..109bb2c 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dto/EpidemicRecordListDTO.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dto/EpidemicRecordListDTO.java
@@ -21,7 +21,6 @@ public class EpidemicRecordListDTO implements Serializable {
     // @ApiModelProperty(value = "主键")
     private Long id;
 
-
     private String street;
 
     // @ApiModelProperty(value = "人员出入信息表id")
diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dto/result/EpidemicPageResultDTO.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dto/result/EpidemicPageResultDTO.java
index b9a42b6..c70d313 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dto/result/EpidemicPageResultDTO.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dto/result/EpidemicPageResultDTO.java
@@ -105,4 +105,14 @@ public class EpidemicPageResultDTO implements Serializable {
      * 接种状态
      */
     private Integer vaccinationState;
+
+    /**
+     * 居住地
+     */
+    private String liveAddressName;
+
+    /**
+     * 所属组织
+     */
+    private String allDeptNames;
 }
\ No newline at end of file
diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/house/service/impl/HousingInformationServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/house/service/impl/HousingInformationServiceImpl.java
index 2ad74c9..2993480 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/house/service/impl/HousingInformationServiceImpl.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/house/service/impl/HousingInformationServiceImpl.java
@@ -706,10 +706,10 @@ public class HousingInformationServiceImpl extends BaseServiceImpl<HousingInform
                     errorLineInfoDto.setSheetName("房屋信息和户主信息");
                     errorLineInfoList.add(errorLineInfoDto);
                 } else {
-                    baseResidentInformationExcel.setResidentsSex(IdentityNoUtils.getSex(residentsIdentityNo));
-                    baseResidentInformationExcel.setResidentsBirthday(DateUtil.parse(IdentityNoUtils.getBirthday(residentsIdentityNo)));
+                    baseResidentInformationExcel.setResidentsSex(IdentityNoUtils.getSex(selfIdentityNo));
+                    baseResidentInformationExcel.setResidentsBirthday(DateUtil.parse(IdentityNoUtils.getBirthday(selfIdentityNo)));
                 }
-                baseResidentInformationExcel.setResidentsIdentityNo(residentsIdentityNo);
+                baseResidentInformationExcel.setSelfIdentityNo(selfIdentityNo);
             }
             if (StringUtils.isBlank(houseHeadRelation)) {
                 errorLineInfoDto = new EpdcPopulationErrorResultDTO();
diff --git a/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoDao.xml b/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoDao.xml
index c87d4d1..8c53b5a 100644
--- a/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoDao.xml
+++ b/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoDao.xml
@@ -7,9 +7,10 @@
         <result property="id" column="ID"/>
         <result property="userName" column="USER_NAME"/>
         <result property="idCard" column="ID_CARD"/>
+        <result property="householdRegisterDetail" column="HOUSEHOLD_REGISTER_DETAIL"/>
         <result property="householdRegisterCode" column="HOUSEHOLD_REGISTER_CODE"/>
         <result property="householdRegisterName" column="HOUSEHOLD_REGISTER_NAME"/>
-        <result property="householdRegisterDetail" column="HOUSEHOLD_REGISTER_DETAIL"/>
+        <result property="liveAddressName" column="LIVE_ADDRESS_NAME"/>
         <result property="revision" column="REVISION"/>
         <result property="createdBy" column="CREATED_BY"/>
         <result property="createdTime" column="CREATED_TIME"/>
@@ -44,6 +45,7 @@
         ui.SPECIAL_CROWD,
         ui.HUSHAI_STATUS,
         ui.MOBILE,
+        ui.LIVE_ADDRESS_NAME,
         ui.HOUSEHOLD_REGISTER_NAME householdRegisterName,
         if(ui.check_state='0','已检测','未检测') as checkStateName,
         hi.ALL_DEPT_NAMES
@@ -124,6 +126,40 @@
             limit #{excelBigDataPageIndex},#{excelBigDataPageSize}
         </if>
     </select>
+    <select id="getEpidemicPage" resultType="com.elink.esua.epdc.vaccine.epidemic.dto.result.EpidemicPageResultDTO">
+        select ui.ID,
+        ui.ID as infoId,
+        ui.USER_NAME,
+        ui.ID_CARD,
+        ui.MOBILE,
+        ui.GENDER,
+        ui.BIRTHDAY,
+        ui.LIVE_ADDRESS_NAME,
+        IFNULL(ui.VACCINATION_NUM, 0) AS VACCINATION_NUM,
+        IFNULL(ui.VACCINATION_STATE, 0) AS VACCINATION_STATE,
+        ui.CREATED_TIME,
+        hi.ALL_DEPT_NAMES
+        from epidemic_user_info ui
+        LEFT JOIN epdc_house_resident hr on CONVERT(hr.RESIDENT_ID, UNSIGNED INTEGER) = 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="idCard!=null and idCard!=''">
+            and ui.ID_CARD like '%${idCard}%'
+        </if>
+        <if test="mobile!=null and mobile!=''">
+            and ui.MOBILE like '%${mobile}%'
+        </if>
+        <if test="userName!=null and userName!=''">
+            and ui.USER_NAME like '%${userName}%'
+        </if>
+        <if test="deptIdList != null">
+            and hi.grid_id in
+            <foreach item="id" collection="deptIdList" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY ui.CREATED_TIME DESC
+    </select>
     <select id="getDetailById" resultType="com.elink.esua.epdc.vaccine.epidemic.dto.EpidemicRecordDetailDTO">
         SELECT ui.USER_NAME,
                ui.ID_CARD,
@@ -373,39 +409,6 @@
         order by t.CREATED_TIME desc
     </select>
 
-    <select id="getEpidemicPage" resultType="com.elink.esua.epdc.vaccine.epidemic.dto.result.EpidemicPageResultDTO">
-        select ui.ID,
-        ui.ID as infoId,
-        ui.USER_NAME,
-        ui.ID_CARD,
-        ui.MOBILE,
-        ui.GENDER,
-        ui.BIRTHDAY,
-        IFNULL(ui.VACCINATION_NUM, 0) AS VACCINATION_NUM,
-        IFNULL(ui.VACCINATION_STATE, 0) AS VACCINATION_STATE,
-        ui.CREATED_TIME,
-        hi.ALL_DEPT_NAMES
-        from epidemic_user_info ui
-        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="idCard!=null and idCard!=''">
-            and ui.ID_CARD like '%${idCard}%'
-        </if>
-        <if test="mobile!=null and mobile!=''">
-            and ui.MOBILE like '%${mobile}%'
-        </if>
-        <if test="userName!=null and userName!=''">
-            and ui.USER_NAME like '%${userName}%'
-        </if>
-        <if test="deptIdList != null">
-            and hi.grid_id in
-            <foreach item="id" collection="deptIdList" open="(" separator="," close=")">
-                #{id}
-            </foreach>
-        </if>
-        ORDER BY ui.CREATED_TIME DESC
-    </select>
     <select id="selectInfoV2"
             resultType="com.elink.esua.epdc.vaccine.epidemic.dto.result.VaccinationInfoResultV2DTO">
         select