From 19a034b3a16732379fbe9ee60023decd1fe84b12 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Thu, 9 Jun 2022 14:37:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/EpidemicUserInfoServiceImpl.java     | 71 ++++++++++---------
 .../impl/EpidemicBuildingUnitServiceImpl.java | 35 +++++----
 2 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java
index 4f2b9b9..b985cb2 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java
@@ -704,11 +704,11 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
             //户主导入数据异常提示
 //            List<EpdcPopulationErrorResultDTO> epdcHouseAndHouseHeadErrorResultDTOS;
             //居民导入数据
-            List<BaseResidentInformationUpdateExcel> BaseResidentInformationUpdateExcels;
+            List<BaseResidentInformationUpdateExcel> excelData;
             // 处理错误数据使用
-            List<BaseResidentInformationUpdateExcel> baseResidentInformationUpdateExcelsNew;
+            List<BaseResidentInformationUpdateExcel> excelDataError;
             //居民导入数据异常提示
-            List<EpdcPopulationErrorResultDTO> epdcResidentErrorResultDTOS;
+            List<EpdcPopulationErrorResultDTO> errorData;
 
             // 存储批量插入实体
             List<BaseResidentInformationUpdateExcel> addList = new ArrayList<>();
@@ -730,10 +730,11 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
 //                    );
 //                } else if (numSheet == 1) {
             // 检验和新增居住人信息
-            BaseResidentInformationUpdateExcels = ExcelImportUtil.importExcel(f, BaseResidentInformationUpdateExcel.class, importParams);
-            baseResidentInformationUpdateExcelsNew = ExcelImportUtil.importExcel(f, BaseResidentInformationUpdateExcel.class, importParams);
+            excelData = ExcelImportUtil.importExcel(f, BaseResidentInformationUpdateExcel.class, importParams);
+            excelData.forEach(item->item.setSelfIdentityNo(item.getSelfIdentityNo().toUpperCase()));
+            excelDataError = ExcelImportUtil.importExcel(f, BaseResidentInformationUpdateExcel.class, importParams);
             // 校验数据
-            epdcResidentErrorResultDTOS = this.checkResidentsExcel(BaseResidentInformationUpdateExcels, baseResidentInformationUpdateExcelsNew, sysPopulationSimpleDictDTOS, addList, addErrorList);
+            errorData = this.checkResidentsExcel(excelData, excelDataError, sysPopulationSimpleDictDTOS, addList, addErrorList);
 //                }
 //            }
             // 校验户主和房屋信息
@@ -754,8 +755,8 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
             epidemicUserErrorService.insertBatch(insertErrorList);
 
             // 校验居住人信息
-            if (epdcResidentErrorResultDTOS.size() > 0) {
-                return new Result().ok(epdcResidentErrorResultDTOS);
+            if (errorData.size() > 0) {
+                return new Result().ok(errorData);
             }
             // 保存户主和房屋信息
 //            if (basePopulationInformationExcels != null && basePopulationInformationExcels.size() > 0) {
@@ -1065,19 +1066,19 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
      * @Date 2020/8/31
      * @Param [basePopulationInformationExcels, basePopulationInformationExcels1]
      **/
-    private List<EpdcPopulationErrorResultDTO> checkResidentsExcel(List<BaseResidentInformationUpdateExcel> basePopulationInformationExcels,
-                                                                   List<BaseResidentInformationUpdateExcel> basePopulationInformationExcelsNew,
-                                                                   List<SysPopulationSimpleDictDTO> sysPopulationSimpleDictDTOS,
+    private List<EpdcPopulationErrorResultDTO> checkResidentsExcel(List<BaseResidentInformationUpdateExcel> excelData,
+                                                                   List<BaseResidentInformationUpdateExcel> excelErrorData,
+                                                                   List<SysPopulationSimpleDictDTO> dictDTOList,
                                                                    List<BaseResidentInformationUpdateExcel> addList,
                                                                    List<BaseResidentInformationUpdateExcel> addErrorList) {
         // 不匹配信息
         List<EpdcPopulationErrorResultDTO> errorLineInfoList = new ArrayList<>();
         EpdcPopulationErrorResultDTO errorLineInfoDto;
         BaseResidentInformationUpdateExcel errorBaseUserInfo;
-        for (int i = 0; i < basePopulationInformationExcels.size(); i++) {
+        for (int i = 0; i < excelData.size(); i++) {
             String errorInfo = "";
-            BaseResidentInformationUpdateExcel BaseResidentInformationUpdateExcel = basePopulationInformationExcels.get(i);
-            errorBaseUserInfo = basePopulationInformationExcelsNew.get(i);
+            BaseResidentInformationUpdateExcel BaseResidentInformationUpdateExcel = excelData.get(i);
+            errorBaseUserInfo = excelErrorData.get(i);
             String selfIdentityNo = BaseResidentInformationUpdateExcel.getSelfIdentityNo() == null ? null : BaseResidentInformationUpdateExcel.getSelfIdentityNo().trim();
             String residentsName = BaseResidentInformationUpdateExcel.getUserName() == null ? null : BaseResidentInformationUpdateExcel.getUserName().trim();
             String residentsSex = BaseResidentInformationUpdateExcel.getGender() == null ? null : BaseResidentInformationUpdateExcel.getGender().trim();
@@ -1133,7 +1134,7 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
             }
             if (StringUtils.isNotBlank(politicsStatus)) {
                 boolean isMatch = false;
-                for (SysPopulationSimpleDictDTO sysPopulationSimpleDictDTO : sysPopulationSimpleDictDTOS) {
+                for (SysPopulationSimpleDictDTO sysPopulationSimpleDictDTO : dictDTOList) {
                     if (PopulationDictConstant.POLITICS_STATUS.equals(sysPopulationSimpleDictDTO.getDicType())) {
                         List<SysSimpleDictDTO> sysSimpleDictList = sysPopulationSimpleDictDTO.getSysSimpleDicts();
                         for (SysSimpleDictDTO sysSimpleDict : sysSimpleDictList) {
@@ -1150,7 +1151,7 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
             }
             if (StringUtils.isNotBlank(specialCrowd)) {
                 boolean isMatch = false;
-                for (SysPopulationSimpleDictDTO sysPopulationSimpleDictDTO : sysPopulationSimpleDictDTOS) {
+                for (SysPopulationSimpleDictDTO sysPopulationSimpleDictDTO : dictDTOList) {
                     if (PopulationDictConstant.SPECIAL_CROWD.equals(sysPopulationSimpleDictDTO.getDicType())) {
                         List<SysSimpleDictDTO> sysSimpleDicts = sysPopulationSimpleDictDTO.getSysSimpleDicts();
                         for (SysSimpleDictDTO sysSimpleDict : sysSimpleDicts) {
@@ -1167,7 +1168,7 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
             }
             if (StringUtils.isNotBlank(peopleCategories)) {
                 boolean isMatch = false;
-                for (SysPopulationSimpleDictDTO sysPopulationSimpleDictDTO : sysPopulationSimpleDictDTOS) {
+                for (SysPopulationSimpleDictDTO sysPopulationSimpleDictDTO : dictDTOList) {
                     if (PopulationDictConstant.PEOPLE_CATEGORIES.equals(sysPopulationSimpleDictDTO.getDicType())) {
                         List<SysSimpleDictDTO> sysSimpleDicts = sysPopulationSimpleDictDTO.getSysSimpleDicts();
                         for (SysSimpleDictDTO sysSimpleDict : sysSimpleDicts) {
@@ -1185,7 +1186,7 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
             //新增字典校验
             if (StringUtils.isNotBlank(standardOfCulture)) {
                 boolean isMatch = false;
-                for (SysPopulationSimpleDictDTO sysPopulationSimpleDictDTO : sysPopulationSimpleDictDTOS) {
+                for (SysPopulationSimpleDictDTO sysPopulationSimpleDictDTO : dictDTOList) {
                     if (PopulationDictConstant.EDUCATION_LEVEL.equals(sysPopulationSimpleDictDTO.getDicType())) {
                         List<SysSimpleDictDTO> sysSimpleDicts = sysPopulationSimpleDictDTO.getSysSimpleDicts();
                         for (SysSimpleDictDTO sysSimpleDict : sysSimpleDicts) {
@@ -1202,7 +1203,7 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
             }
             if (StringUtils.isNotBlank(health)) {
                 boolean isMatch = false;
-                for (SysPopulationSimpleDictDTO sysPopulationSimpleDictDTO : sysPopulationSimpleDictDTOS) {
+                for (SysPopulationSimpleDictDTO sysPopulationSimpleDictDTO : dictDTOList) {
                     if (PopulationDictConstant.BODY_STATUS.equals(sysPopulationSimpleDictDTO.getDicType())) {
                         List<SysSimpleDictDTO> sysSimpleDicts = sysPopulationSimpleDictDTO.getSysSimpleDicts();
                         for (SysSimpleDictDTO sysSimpleDict : sysSimpleDicts) {
@@ -1219,7 +1220,7 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
             }
             if (StringUtils.isNotBlank(maritalStatus)) {
                 boolean isMatch = false;
-                for (SysPopulationSimpleDictDTO sysPopulationSimpleDictDTO : sysPopulationSimpleDictDTOS) {
+                for (SysPopulationSimpleDictDTO sysPopulationSimpleDictDTO : dictDTOList) {
                     if (PopulationDictConstant.MARITAL_STATUS.equals(sysPopulationSimpleDictDTO.getDicType())) {
                         List<SysSimpleDictDTO> sysSimpleDicts = sysPopulationSimpleDictDTO.getSysSimpleDicts();
                         for (SysSimpleDictDTO sysSimpleDict : sysSimpleDicts) {
@@ -1236,7 +1237,7 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
             }
             if (StringUtils.isNotBlank(accountType)) {
                 boolean isMatch = false;
-                for (SysPopulationSimpleDictDTO sysPopulationSimpleDictDTO : sysPopulationSimpleDictDTOS) {
+                for (SysPopulationSimpleDictDTO sysPopulationSimpleDictDTO : dictDTOList) {
                     if (PopulationDictConstant.ACCOUNT_TYPE.equals(sysPopulationSimpleDictDTO.getDicType())) {
                         List<SysSimpleDictDTO> sysSimpleDicts = sysPopulationSimpleDictDTO.getSysSimpleDicts();
                         for (SysSimpleDictDTO sysSimpleDict : sysSimpleDicts) {
@@ -1253,7 +1254,7 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
             }
             if (StringUtils.isNotBlank(workStatus)) {
                 boolean isMatch = false;
-                for (SysPopulationSimpleDictDTO sysPopulationSimpleDictDTO : sysPopulationSimpleDictDTOS) {
+                for (SysPopulationSimpleDictDTO sysPopulationSimpleDictDTO : dictDTOList) {
                     if (PopulationDictConstant.EMPLOYMENT_STATUS.equals(sysPopulationSimpleDictDTO.getDicType())) {
                         List<SysSimpleDictDTO> sysSimpleDicts = sysPopulationSimpleDictDTO.getSysSimpleDicts();
                         for (SysSimpleDictDTO sysSimpleDict : sysSimpleDicts) {
@@ -1270,7 +1271,7 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
             }
             if (StringUtils.isNotBlank(unemploymentReason)) {
                 boolean isMatch = false;
-                for (SysPopulationSimpleDictDTO sysPopulationSimpleDictDTO : sysPopulationSimpleDictDTOS) {
+                for (SysPopulationSimpleDictDTO sysPopulationSimpleDictDTO : dictDTOList) {
                     if (PopulationDictConstant.UNEMPLOYMENT_REASON.equals(sysPopulationSimpleDictDTO.getDicType())) {
                         List<SysSimpleDictDTO> sysSimpleDicts = sysPopulationSimpleDictDTO.getSysSimpleDicts();
                         for (SysSimpleDictDTO sysSimpleDict : sysSimpleDicts) {
@@ -1287,7 +1288,7 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
             }
             if (StringUtils.isNotBlank(familyCategory)) {
                 boolean isMatch = false;
-                for (SysPopulationSimpleDictDTO sysPopulationSimpleDictDTO : sysPopulationSimpleDictDTOS) {
+                for (SysPopulationSimpleDictDTO sysPopulationSimpleDictDTO : dictDTOList) {
                     if (PopulationDictConstant.FAMILY_CATEGORY.equals(sysPopulationSimpleDictDTO.getDicType())) {
                         List<SysSimpleDictDTO> sysSimpleDicts = sysPopulationSimpleDictDTO.getSysSimpleDicts();
                         for (SysSimpleDictDTO sysSimpleDict : sysSimpleDicts) {
@@ -1304,7 +1305,7 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
             }
             if (StringUtils.isNotBlank(helpStatus)) {
                 boolean isMatch = false;
-                for (SysPopulationSimpleDictDTO sysPopulationSimpleDictDTO : sysPopulationSimpleDictDTOS) {
+                for (SysPopulationSimpleDictDTO sysPopulationSimpleDictDTO : dictDTOList) {
                     if (PopulationDictConstant.HELP_STATUS.equals(sysPopulationSimpleDictDTO.getDicType())) {
                         List<SysSimpleDictDTO> sysSimpleDicts = sysPopulationSimpleDictDTO.getSysSimpleDicts();
                         for (SysSimpleDictDTO sysSimpleDict : sysSimpleDicts) {
@@ -1321,7 +1322,7 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
             }
             if (StringUtils.isNotBlank(motorVehicleCategory)) {
                 boolean isMatch = false;
-                for (SysPopulationSimpleDictDTO sysPopulationSimpleDictDTO : sysPopulationSimpleDictDTOS) {
+                for (SysPopulationSimpleDictDTO sysPopulationSimpleDictDTO : dictDTOList) {
                     if (PopulationDictConstant.MOTOR_VEHICLE_CATEGORY.equals(sysPopulationSimpleDictDTO.getDicType())) {
                         List<SysSimpleDictDTO> sysSimpleDicts = sysPopulationSimpleDictDTO.getSysSimpleDicts();
                         for (SysSimpleDictDTO sysSimpleDict : sysSimpleDicts) {
@@ -1363,18 +1364,18 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
      * @Date 2020/8/31
      * @Param [baseResidentInformationExcels]
      **/
-    private void saveResidentList(List<BaseResidentInformationUpdateExcel> baseResidentInformationExcels, ParentAndAllDeptDTO parentAndAllDeptDTO, Map<String, String> populationIdNoAndIdMap) {
+    private void saveResidentList(List<BaseResidentInformationUpdateExcel> excelData, ParentAndAllDeptDTO parentAndAllDeptDTO, Map<String, String> populationIdNoAndIdMap) {
 
         List<EpidemicUserInfoEntity> addList = new ArrayList<>();
         List<EpidemicUserInfoEntity> updateList = new ArrayList<>();
-        List<EpidemicUserInfoEntity> checkList = epidemicUserInfoService.listByIdCards(baseResidentInformationExcels.stream().map(BaseResidentInformationUpdateExcel::getSelfIdentityNo).collect(Collectors.toList()));
+        List<EpidemicUserInfoEntity> checkList = epidemicUserInfoService.listByIdCards(excelData.stream().map(BaseResidentInformationUpdateExcel::getSelfIdentityNo).collect(Collectors.toList()));
 
-        for (BaseResidentInformationUpdateExcel baseResidentInformationExcel : baseResidentInformationExcels) {
+        for (BaseResidentInformationUpdateExcel userInfo : excelData) {
             //插入居民信息
-            EpidemicUserInfoEntity epidemicUserInfoEntity = ConvertUtils.sourceToTarget(baseResidentInformationExcel, EpidemicUserInfoEntity.class);
-            epidemicUserInfoEntity.setIdCard(baseResidentInformationExcel.getSelfIdentityNo());
-            if (StringUtils.isNotBlank(baseResidentInformationExcel.getMotorVehicleNum())) {
-                epidemicUserInfoEntity.setMotorVehicleNum(Integer.valueOf(baseResidentInformationExcel.getMotorVehicleNum()));
+            EpidemicUserInfoEntity epidemicUserInfoEntity = ConvertUtils.sourceToTarget(userInfo, EpidemicUserInfoEntity.class);
+            epidemicUserInfoEntity.setIdCard(userInfo.getSelfIdentityNo());
+            if (StringUtils.isNotBlank(userInfo.getMotorVehicleNum())) {
+                epidemicUserInfoEntity.setMotorVehicleNum(Integer.valueOf(userInfo.getMotorVehicleNum()));
             }
             if (null != parentAndAllDeptDTO) {
                 epidemicUserInfoEntity.setDeptId(parentAndAllDeptDTO.getGridId());
@@ -1402,7 +1403,7 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
                 epidemicUserInfoEntity.setUnemploymentRegister("");
             }
             // 已存在的居民信息进行更新，否则进行插入操作
-            Optional<EpidemicUserInfoEntity> optional = checkList.stream().filter(item -> item.getIdCard().equals(baseResidentInformationExcel.getSelfIdentityNo())).findFirst();
+            Optional<EpidemicUserInfoEntity> optional = checkList.stream().filter(item -> item.getIdCard().equals(userInfo.getSelfIdentityNo())).findFirst();
             if (!optional.isPresent()) {
                 addList.add(epidemicUserInfoEntity);
             } else {
@@ -1497,7 +1498,7 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
 //            houseResidentDao.insert(houseResidentEntity);
             if (null != parentAndAllDeptDTO) {
                 // 更新疫苗接种记录
-                vaccinationInfoHandle(baseResidentInformationExcel.getSelfIdentityNo(), parentAndAllDeptDTO);
+                vaccinationInfoHandle(userInfo.getSelfIdentityNo(), parentAndAllDeptDTO);
             }
 
         }
diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java
index 43f28d5..faa3cfc 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java
@@ -246,11 +246,11 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
             //户主身份证和插入的ID，便于保存居住人信息时匹配户主信息
             Map<String, String> populationIdNoAndIdMap = new HashMap<>();
             //居民导入数据
-            List<BaseResidentInformationUpdateExcel> baseResidentInformationUpdateExcels;
+            List<BaseResidentInformationUpdateExcel> excelData;
             // 处理错误数据使用
-            List<BaseResidentInformationUpdateExcel> baseResidentInformationUpdateExcelsNew;
+            List<BaseResidentInformationUpdateExcel> excelErrorData;
             //居民导入数据异常提示
-            List<EpdcPopulationErrorResultDTO> epdcPopulationErrorResultDTOS;
+            List<EpdcPopulationErrorResultDTO> errorInfo;
 
             // 存储批量插入实体
             List<BaseResidentInformationUpdateExcel> addList = new ArrayList<>();
@@ -258,10 +258,10 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
             List<BaseResidentInformationUpdateExcel> addErrorList = new ArrayList<>();
 
             // 检验和新增居住人信息
-            baseResidentInformationUpdateExcels = ExcelImportUtil.importExcel(f, BaseResidentInformationUpdateExcel.class, importParams);
-            baseResidentInformationUpdateExcelsNew = ExcelImportUtil.importExcel(f, BaseResidentInformationUpdateExcel.class, importParams);
+            excelData = ExcelImportUtil.importExcel(f, BaseResidentInformationUpdateExcel.class, importParams);
+            excelErrorData = ExcelImportUtil.importExcel(f, BaseResidentInformationUpdateExcel.class, importParams);
             // 校验数据
-            epdcPopulationErrorResultDTOS = this.checkResidentsExcel(baseResidentInformationUpdateExcels, baseResidentInformationUpdateExcelsNew, null, addList, addErrorList);
+            errorInfo = this.checkResidentsExcel(excelData, excelErrorData, null, addList, addErrorList);
 
             // 保存居住人信息
             if (addList.size() > 0) {
@@ -276,8 +276,8 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
             epidemicUserErrorService.insertBatch(insertErrorList);
 
             // 校验居住人信息
-            if (epdcPopulationErrorResultDTOS.size() > 0) {
-                return new Result().ok(epdcPopulationErrorResultDTOS);
+            if (errorInfo.size() > 0) {
+                return new Result().ok(errorInfo);
             }
 
         } catch (Exception e1) {
@@ -313,8 +313,8 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
      * @Date 2020/8/31
      * @Param [basePopulationInformationExcels, basePopulationInformationExcels1]
      **/
-    private List<EpdcPopulationErrorResultDTO> checkResidentsExcel(List<BaseResidentInformationUpdateExcel> basePopulationInformationExcels,
-                                                                   List<BaseResidentInformationUpdateExcel> basePopulationInformationExcelsNew,
+    private List<EpdcPopulationErrorResultDTO> checkResidentsExcel(List<BaseResidentInformationUpdateExcel> excelData,
+                                                                   List<BaseResidentInformationUpdateExcel> excelErrorData,
                                                                    List<SysPopulationSimpleDictDTO> sysPopulationSimpleDictDTOS,
                                                                    List<BaseResidentInformationUpdateExcel> addList,
                                                                    List<BaseResidentInformationUpdateExcel> addErrorList) {
@@ -322,10 +322,10 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
         List<EpdcPopulationErrorResultDTO> errorLineInfoList = new ArrayList<>();
         EpdcPopulationErrorResultDTO errorLineInfoDto;
         BaseResidentInformationUpdateExcel errorBaseUserInfo;
-        for (int i = 0; i < basePopulationInformationExcels.size(); i++) {
+        for (int i = 0; i < excelData.size(); i++) {
             String errorInfo = "";
-            BaseResidentInformationUpdateExcel baseResidentInformationUpdateExcel = basePopulationInformationExcels.get(i);
-            errorBaseUserInfo = basePopulationInformationExcelsNew.get(i);
+            BaseResidentInformationUpdateExcel baseResidentInformationUpdateExcel = excelData.get(i);
+            errorBaseUserInfo = excelErrorData.get(i);
             String selfIdentityNo = baseResidentInformationUpdateExcel.getSelfIdentityNo() == null ? null : baseResidentInformationUpdateExcel.getSelfIdentityNo().trim();
             String plot = baseResidentInformationUpdateExcel.getPlot() == null ? null : baseResidentInformationUpdateExcel.getPlot().trim();
             String buildingNo = baseResidentInformationUpdateExcel.getBuildingNo() == null ? null : baseResidentInformationUpdateExcel.getBuildingNo().trim();
@@ -375,16 +375,16 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
      * @Date 2020/8/31
      * @Param [baseResidentInformationExcels]
      **/
-    private void saveResidentList(List<BaseResidentInformationUpdateExcel> baseResidentInformationExcels, ParentAndAllDeptDTO parentAndAllDeptDTO, Map<String, String> populationIdNoAndIdMap) {
+    private void saveResidentList(List<BaseResidentInformationUpdateExcel> excelData, ParentAndAllDeptDTO parentAndAllDeptDTO, Map<String, String> populationIdNoAndIdMap) {
 
         List<EpidemicUserInfoEntity> addList = new ArrayList<>();
         List<EpidemicUserInfoEntity> updateList = new ArrayList<>();
         Result<CompleteDeptDTO> allDeptInfo = adminVimFeignClient.getCompleteDept(parentAndAllDeptDTO.getGridId().toString());
         CompleteDeptDTO completeDept = allDeptInfo.getData();
 
-        List<EpidemicUserInfoEntity> checkList = epidemicUserInfoService.listByIdCards(baseResidentInformationExcels.stream().map(BaseResidentInformationUpdateExcel::getSelfIdentityNo).collect(Collectors.toList()));
+        List<EpidemicUserInfoEntity> checkList = epidemicUserInfoService.listByIdCards(excelData.stream().map(BaseResidentInformationUpdateExcel::getSelfIdentityNo).collect(Collectors.toList()));
 
-        for (BaseResidentInformationUpdateExcel baseResidentInformationExcel : baseResidentInformationExcels) {
+        for (BaseResidentInformationUpdateExcel baseResidentInformationExcel : excelData) {
             //插入居民信息
             EpidemicUserInfoEntity epidemicUserInfoEntity = ConvertUtils.sourceToTarget(baseResidentInformationExcel, EpidemicUserInfoEntity.class);
             epidemicUserInfoEntity.setIdCard(baseResidentInformationExcel.getSelfIdentityNo());
@@ -417,7 +417,6 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
         int roomCode = getMaxCode();
         List<EpidemicUnitInfoResultDTO> unitList = listAllUnitInfo();
         List<EpidemicUnitOwnerEntity> addOwner = new ArrayList<>();
-        List<EpidemicBuildingUnitEntity> addUnit = new ArrayList<>();
         for (EpidemicUserInfoEntity item : addList) {
             // 只有信息完整的才进行匹配
             if (StringUtils.isNotBlank(item.getPlot()) && StringUtils.isNotBlank(item.getBuildingNo()) && StringUtils.isNotBlank(item.getUnit())) {
@@ -449,7 +448,7 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
                         unitEntity.setCommunityName(completeDept.getCommunity());
                         unitEntity.setStreetId(completeDept.getStreetId().toString());
                         unitEntity.setStreetName(completeDept.getStreet());
-                        addUnit.add(unitEntity);
+                        insert(unitEntity);
                         EpidemicUnitOwnerEntity entity = new EpidemicUnitOwnerEntity();
                         entity.setIdCard(item.getIdCard());
                         entity.setUnitId(unitEntity.getId());