From 3ce985d2eabaa3b4153e0ba10c2748728bc52f5f Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Thu, 16 Sep 2021 14:28:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=88=BF=E5=B1=8B=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=97=B6=EF=BC=8C=E5=90=8C=E6=AD=A5=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E8=AE=B0=E5=BD=95=E7=BD=91?=
 =?UTF-8?q?=E6=A0=BC=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/HousingInformationServiceImpl.java   | 39 ++++++++++++++++---
 .../vaccine/vim/dao/VaccinationInfoDao.java   | 10 +++++
 .../mapper/house/HouseResidentDao.xml         |  1 +
 .../mapper/vim/VaccinationInfoDao.xml         | 11 ++++++
 4 files changed, 56 insertions(+), 5 deletions(-)

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 7fe694a..d352e12 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
@@ -56,6 +56,8 @@ import com.elink.esua.epdc.vaccine.house.service.HouseBusinessInfoService;
 import com.elink.esua.epdc.vaccine.house.service.HouseRentInfoService;
 import com.elink.esua.epdc.vaccine.house.service.HousingInformationService;
 import com.elink.esua.epdc.vaccine.house.service.PopulationInformationService;
+import com.elink.esua.epdc.vaccine.vim.dao.VaccinationInfoDao;
+import com.elink.esua.epdc.vaccine.vim.entity.VaccinationInfoEntity;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -81,7 +83,6 @@ public class HousingInformationServiceImpl extends BaseServiceImpl<HousingInform
     @Autowired
     private HousingInformationRedis housingInformationRedis;
 
-
     @Autowired
     private HouseRentInfoService houseRentInfoService;
 
@@ -103,6 +104,9 @@ public class HousingInformationServiceImpl extends BaseServiceImpl<HousingInform
     @Resource
     private EpidemicUserInfoDao epidemicUserInfoDao;
 
+    @Resource
+    private VaccinationInfoDao vaccinationInfoDao;
+
     @Override
     public PageData<HousingInformationDTO> page(Map<String, Object> params) {
         IPage<HousingInformationEntity> page = baseDao.selectPage(
@@ -389,7 +393,7 @@ public class HousingInformationServiceImpl extends BaseServiceImpl<HousingInform
             }
             // 保存居住人信息
             if (baseResidentInformationExcels != null && baseResidentInformationExcels.size() > 0) {
-                saveResidentList(baseResidentInformationExcels, populationIdNoAndIdMap);
+                saveResidentList(baseResidentInformationExcels, parentAndAllDeptDTO, populationIdNoAndIdMap);
             }
         } catch (Exception e1) {
             throw new RenException("导入失败：请检查导入模板或导入数据");
@@ -471,7 +475,7 @@ public class HousingInformationServiceImpl extends BaseServiceImpl<HousingInform
      * @Date 2020/8/31
      * @Param [baseResidentInformationExcels]
      **/
-    private void saveResidentList(List<BaseResidentInformationExcel> baseResidentInformationExcels, Map<String, String> populationIdNoAndIdMap) {
+    private void saveResidentList(List<BaseResidentInformationExcel> baseResidentInformationExcels, ParentAndAllDeptDTO parentAndAllDeptDTO, Map<String, String> populationIdNoAndIdMap) {
         for (BaseResidentInformationExcel baseResidentInformationExcel : baseResidentInformationExcels) {
             //插入居民信息
             PopulationInformationEntity populationInformationEntity = ConvertUtils.sourceToTarget(baseResidentInformationExcel, PopulationInformationEntity.class);
@@ -480,9 +484,10 @@ public class HousingInformationServiceImpl extends BaseServiceImpl<HousingInform
             epidemicUserInfoEntity.setIdCard(baseResidentInformationExcel.getSelfIdentityNo());
             EpidemicUserInfoEntity check = epidemicUserInfoService.selectInfoByIdCard(baseResidentInformationExcel.getSelfIdentityNo());
             if (null == check) {
+                epidemicUserInfoEntity.setRelation(baseResidentInformationExcel.getHouseHeadRelation());
                 epidemicUserInfoService.insert(epidemicUserInfoEntity);
             } else {
-                check.setRelation(epidemicUserInfoEntity.getRelation());
+                check.setRelation(baseResidentInformationExcel.getHouseHeadRelation());
                 check.setUserName(epidemicUserInfoEntity.getUserName());
                 check.setGender(epidemicUserInfoEntity.getGender());
                 check.setNation(epidemicUserInfoEntity.getNation());
@@ -493,7 +498,6 @@ public class HousingInformationServiceImpl extends BaseServiceImpl<HousingInform
                 check.setPeopleCategories(epidemicUserInfoEntity.getPeopleCategories());
                 check.setSpecialCrowd(epidemicUserInfoEntity.getSpecialCrowd());
                 check.setPoliticsStatus(epidemicUserInfoEntity.getPoliticsStatus());
-
                 epidemicUserInfoService.update(ConvertUtils.sourceToTarget(check, EpidemicUserInfoDTO.class));
             }
             //插入房屋人员关联关系表
@@ -523,6 +527,8 @@ public class HousingInformationServiceImpl extends BaseServiceImpl<HousingInform
             houseResidentEntity.setHouseHeadRelation(baseResidentInformationExcel.getHouseHeadRelation());
             houseResidentDao.insert(houseResidentEntity);
 
+            // 更新疫苗接种记录
+            vaccinationInfoHandle(baseResidentInformationExcel.getSelfIdentityNo(), parentAndAllDeptDTO);
         }
 
     }
@@ -578,6 +584,8 @@ public class HousingInformationServiceImpl extends BaseServiceImpl<HousingInform
             houseResidentDao.insert(houseResidentEntity);
             populationIdNoAndIdMap.put(basePopulationInformationExcel.getResidentsIdentityNo(), epidemicUserInfoEntity.getId().toString());
             populationIdNoAndIdMap.put(epidemicUserInfoEntity.getId().toString(), housingInformationEntity.getId());
+            // 更新疫苗接种记录
+            vaccinationInfoHandle(basePopulationInformationExcel.getResidentsIdentityNo(), parentAndAllDeptDTO);
         }
         return populationIdNoAndIdMap;
     }
@@ -1557,4 +1565,25 @@ public class HousingInformationServiceImpl extends BaseServiceImpl<HousingInform
         return entity;
     }
 
+    /**
+     * 更新疫苗接种信息
+     *
+     * @param idCard
+     * @param parentAndAllDeptDTO
+     * @return void
+     * @author zhy
+     * @date 2021/9/16 14:09
+     */
+    private void vaccinationInfoHandle(String idCard, ParentAndAllDeptDTO parentAndAllDeptDTO) {
+        // 更新疫苗接种网格信息
+        VaccinationInfoEntity vaccinationInfoEntity = new VaccinationInfoEntity();
+        vaccinationInfoEntity.setIdentityNo(idCard);
+        vaccinationInfoEntity.setGridId(parentAndAllDeptDTO.getGridId());
+        vaccinationInfoEntity.setAllDeptNames(parentAndAllDeptDTO.getAllDeptNames());
+        vaccinationInfoEntity.setAllDeptIds(parentAndAllDeptDTO.getAllDeptIds());
+        vaccinationInfoEntity.setParentDeptNames(parentAndAllDeptDTO.getParentDeptNames());
+        vaccinationInfoEntity.setParentDeptIds(parentAndAllDeptDTO.getParentDeptIds());
+        vaccinationInfoDao.updateDeptInfo(vaccinationInfoEntity);
+    }
+
 }
\ No newline at end of file
diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/dao/VaccinationInfoDao.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/dao/VaccinationInfoDao.java
index 51919b2..c9a8626 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/dao/VaccinationInfoDao.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/dao/VaccinationInfoDao.java
@@ -79,6 +79,16 @@ public interface VaccinationInfoDao extends BaseDao<VaccinationInfoEntity> {
      */
     void updateAddress(VaccinationInfoEntity entity);
 
+    /**
+     * 更新网格信息
+     *
+     * @param entity
+     * @return void
+     * @author zhy
+     * @date 2021/5/20 17:46
+     */
+    void updateDeptInfo(VaccinationInfoEntity entity);
+
     /**
      * 查询实际接种情况
      *
diff --git a/epdc-cloud-vim-yushan/src/main/resources/mapper/house/HouseResidentDao.xml b/epdc-cloud-vim-yushan/src/main/resources/mapper/house/HouseResidentDao.xml
index e211da9..8fffacf 100644
--- a/epdc-cloud-vim-yushan/src/main/resources/mapper/house/HouseResidentDao.xml
+++ b/epdc-cloud-vim-yushan/src/main/resources/mapper/house/HouseResidentDao.xml
@@ -35,6 +35,7 @@
             t.RELATION as HOUSE_HEAD_RELATION
         from epidemic_user_info t left join epdc_house_resident t1 on t1.RESIDENT_ID = t.ID
         where t.DEL_FLAG ='0' and t1.DEL_FLAG ='0' and t1.IS_HOUSE_HEAD = '0' and t1.HOUSE_HEAD_ID = #{houseHeadId}
+        GROUP BY t.id
         order by t1.CREATED_TIME desc
     </select>
     <select id="selectByHouseResidentId" resultType="com.elink.esua.epdc.dto.house.PopulationInformationDTO">
diff --git a/epdc-cloud-vim-yushan/src/main/resources/mapper/vim/VaccinationInfoDao.xml b/epdc-cloud-vim-yushan/src/main/resources/mapper/vim/VaccinationInfoDao.xml
index 8e28e1a..aa3c407 100644
--- a/epdc-cloud-vim-yushan/src/main/resources/mapper/vim/VaccinationInfoDao.xml
+++ b/epdc-cloud-vim-yushan/src/main/resources/mapper/vim/VaccinationInfoDao.xml
@@ -153,6 +153,17 @@
     WHERE id = #{id}
     </update>
 
+    <update id="updateDeptInfo">
+    UPDATE vaccination_info
+    SET
+    GRID_ID = #{gridId},
+	PARENT_DEPT_IDS = #{parentDeptIds},
+	PARENT_DEPT_NAMES = #{parentDeptNames},
+	ALL_DEPT_IDS = #{allDeptIds},
+	ALL_DEPT_NAMES = #{allDeptNames}
+    WHERE IDENTITY_NO = #{identityNo} AND DEL_FLAG = '0'
+    </update>
+
     <select id="selectAllVaccinationInfo" resultType="com.elink.esua.epdc.vaccine.vim.dto.VaccinationInfoDTO">
         SELECT
         COUNT(0) AS dose,