From 4a889989bce1f93efd81d93f17e9b56cbdc6bda8 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Fri, 10 Sep 2021 16:44:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E4=BD=8F=E6=88=B7=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E6=9B=B4=E6=96=B0=E5=8E=9F=E6=9D=A5=E4=BD=8F=E6=88=B7?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E9=83=A8=E9=97=A8=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/HousingInformationServiceImpl.java      | 16 ++++++++++++++++
 .../mapper/epidemic/EpidemicUserInfoDao.xml      |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

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 7e0412d..2ad74c9 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
@@ -42,6 +42,7 @@ import com.elink.esua.epdc.dto.house.SysPopulationSimpleDictDTO;
 import com.elink.esua.epdc.dto.house.form.SysPopulationSimpleDictFormDTO;
 import com.elink.esua.epdc.dto.house.result.EpdcPopulationErrorResultDTO;
 import com.elink.esua.epdc.vaccine.epidemic.dao.EpidemicUserInfoDao;
+import com.elink.esua.epdc.vaccine.epidemic.dto.EpidemicUserInfoDTO;
 import com.elink.esua.epdc.vaccine.epidemic.entity.EpidemicUserInfoEntity;
 import com.elink.esua.epdc.vaccine.epidemic.service.EpidemicUserInfoService;
 import com.elink.esua.epdc.vaccine.feign.VimAdminFeignClient;
@@ -382,9 +383,11 @@ public class HousingInformationServiceImpl extends BaseServiceImpl<HousingInform
             if (epdcResidentErrorResultDTOS != null && epdcResidentErrorResultDTOS.size() > 0) {
                 return new Result().ok(epdcResidentErrorResultDTOS);
             }
+            // 保存户主和房屋信息
             if (basePopulationInformationExcels != null && basePopulationInformationExcels.size() > 0) {
                 populationIdNoAndIdMap = savePopulationListEnd(basePopulationInformationExcels, parentAndAllDeptDTO);
             }
+            // 保存居住人信息
             if (baseResidentInformationExcels != null && baseResidentInformationExcels.size() > 0) {
                 saveResidentList(baseResidentInformationExcels, populationIdNoAndIdMap);
             }
@@ -478,6 +481,19 @@ public class HousingInformationServiceImpl extends BaseServiceImpl<HousingInform
             EpidemicUserInfoEntity check = epidemicUserInfoService.selectInfoByIdCard(baseResidentInformationExcel.getSelfIdentityNo());
             if (null == check) {
                 epidemicUserInfoService.insert(epidemicUserInfoEntity);
+            } else {
+                check.setRelation(epidemicUserInfoEntity.getRelation());
+                check.setUserName(epidemicUserInfoEntity.getUserName());
+                check.setGender(epidemicUserInfoEntity.getGender());
+                check.setNation(epidemicUserInfoEntity.getNation());
+                check.setMobile(epidemicUserInfoEntity.getMobile());
+                check.setWorkUnits(epidemicUserInfoEntity.getWorkUnits());
+                check.setLiveAddressName(epidemicUserInfoEntity.getLiveAddressName());
+                check.setPeopleCategories(epidemicUserInfoEntity.getPeopleCategories());
+                check.setSpecialCrowd(epidemicUserInfoEntity.getSpecialCrowd());
+                check.setPoliticsStatus(epidemicUserInfoEntity.getPoliticsStatus());
+
+                epidemicUserInfoService.update(ConvertUtils.sourceToTarget(check, EpidemicUserInfoDTO.class));
             }
             //插入房屋人员关联关系表
             HouseResidentEntity houseResidentEntity = ConvertUtils.sourceToTarget(baseResidentInformationExcel, HouseResidentEntity.class);
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 3a40070..c87d4d1 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
@@ -48,7 +48,7 @@
         if(ui.check_state='0','已检测','未检测') as checkStateName,
         hi.ALL_DEPT_NAMES
         from epidemic_user_info ui
-        LEFT JOIN epdc_house_resident hr on hr.RESIDENT_ID = ui.id
+        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="checkState != null and checkState != '' and checkState== '0'.toString()">