From fb0af0360b0753bcc88fc2cdbad60f04124cf489 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Thu, 23 Jun 2022 11:18:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A0=E8=BA=AB=E4=BB=BD=E8=AF=81=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=8F=AA=E5=AF=BC=E5=85=A5=E6=88=BF=E5=B1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/EpidemicBuildingUnitServiceImpl.java | 73 ++++++++++++-------
 1 file changed, 48 insertions(+), 25 deletions(-)

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 bab1233..faeb065 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
@@ -621,9 +621,10 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
             String unit = baseResidentInformationUpdateExcel.getUnit() == null ? null : baseResidentInformationUpdateExcel.getUnit().trim();
             String roomNo = baseResidentInformationUpdateExcel.getRoomNo() == null ? null : baseResidentInformationUpdateExcel.getRoomNo().trim();
 
-            if (StringUtils.isBlank(selfIdentityNo)) {
-                errorInfo += "本人身份证号为空;";
-            } else if (StringUtils.isNotBlank(selfIdentityNo)) {
+//            if (StringUtils.isBlank(selfIdentityNo)) {
+//                errorInfo += "本人身份证号为空;";
+//            } else
+            if (StringUtils.isNotBlank(selfIdentityNo)) {
                 String result = IdentityNoUtils.IdentityNoVerification(selfIdentityNo);
                 if (result != null) {
                     errorInfo += "本人身份证号码有误;";
@@ -702,14 +703,20 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
                 item.setUnit(item.getUnit().trim().toUpperCase());
                 item.setRoomNo(item.getRoomNo().trim().toUpperCase());
             });
-            epidemicUserInfoService.insertBatch(addList);
+
+            List<EpidemicUserInfoEntity> addListTrue = addList.stream().filter(item -> StringUtils.isNotBlank(item.getIdCard())).collect(Collectors.toList());
+
+            epidemicUserInfoService.insertBatch(addListTrue);
         }
         if (!updateList.isEmpty()) {
             updateList.forEach(item -> {
                 item.setUnit(item.getUnit().trim().toUpperCase());
                 item.setRoomNo(item.getRoomNo().trim().toUpperCase());
             });
-            epidemicUserInfoService.updateBatchById(updateList);
+
+            List<EpidemicUserInfoEntity> updListTrue = updateList.stream().filter(item -> StringUtils.isNotBlank(item.getIdCard())).collect(Collectors.toList());
+
+            epidemicUserInfoService.updateBatchById(updListTrue);
         }
         // 补充人房关系
 
@@ -720,12 +727,14 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
             // 只有信息完整的才进行匹配
             Optional<EpidemicUnitInfoResultDTO> unitOptional = unitList.stream().filter(unit -> unit.getPlotName().equals(item.getPlot()) && unit.getBuildingName().equals(item.getBuildingNo()) && unit.getUnit().equals(item.getUnit()) && unit.getRoomNo().equals(item.getRoomNo())).findFirst();
             if (unitOptional.isPresent()) {
-                EpidemicUnitOwnerEntity entity = new EpidemicUnitOwnerEntity();
-                entity.setIdCard(item.getIdCard());
-                entity.setUnitId(unitOptional.get().getUnitId());
-                entity.setOwnerName(item.getUserName());
-                entity.setMobile(item.getMobile());
-                addOwner.add(entity);
+                if (StringUtils.isNotBlank(item.getIdCard())) {
+                    EpidemicUnitOwnerEntity entity = new EpidemicUnitOwnerEntity();
+                    entity.setIdCard(item.getIdCard());
+                    entity.setUnitId(unitOptional.get().getUnitId());
+                    entity.setOwnerName(item.getUserName());
+                    entity.setMobile(item.getMobile());
+                    addOwner.add(entity);
+                }
             } else {
                 Optional<EpidemicPlotBuildingResultDTO> buildingOptional = buildingList.stream().filter(build -> build.getPlotName().equals(item.getPlot()) && build.getBuildingName().equals(item.getBuildingNo())).findFirst();
                 if (buildingOptional.isPresent()) {
@@ -763,12 +772,14 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
                     newUnit.setRoomNo(item.getRoomNo().trim().toUpperCase());
                     unitList.add(newUnit);
 
-                    EpidemicUnitOwnerEntity entity = new EpidemicUnitOwnerEntity();
-                    entity.setIdCard(item.getIdCard());
-                    entity.setUnitId(unitEntity.getId());
-                    entity.setOwnerName(item.getUserName());
-                    entity.setMobile(item.getMobile());
-                    addOwner.add(entity);
+                    if (StringUtils.isNotBlank(item.getIdCard())) {
+                        EpidemicUnitOwnerEntity entity = new EpidemicUnitOwnerEntity();
+                        entity.setIdCard(item.getIdCard());
+                        entity.setUnitId(unitOptional.get().getUnitId());
+                        entity.setOwnerName(item.getUserName());
+                        entity.setMobile(item.getMobile());
+                        addOwner.add(entity);
+                    }
                 }
             }
         }
@@ -778,12 +789,22 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
             if (StringUtils.isNotBlank(item.getPlot()) && StringUtils.isNotBlank(item.getBuildingNo()) && StringUtils.isNotBlank(item.getUnit())) {
                 Optional<EpidemicUnitInfoResultDTO> unitOptional = unitList.stream().filter(unit -> unit.getPlotName().equals(item.getPlot()) && unit.getBuildingName().equals(item.getBuildingNo()) && unit.getUnit().equals(item.getUnit()) && unit.getRoomNo().equals(item.getRoomNo())).findFirst();
                 if (unitOptional.isPresent()) {
+                    if (StringUtils.isNotBlank(item.getIdCard())) {
+                        EpidemicUnitOwnerEntity entity = new EpidemicUnitOwnerEntity();
+                        entity.setIdCard(item.getIdCard());
+                        entity.setUnitId(unitOptional.get().getUnitId());
+                        entity.setOwnerName(item.getUserName());
+                        entity.setMobile(item.getMobile());
+                        epidemicUnitOwnerService.deleteByIdCard(item.getIdCard());
+                        addOwner.add(entity);
+                    }
+
                     EpidemicUnitOwnerEntity entity = new EpidemicUnitOwnerEntity();
                     entity.setIdCard(item.getIdCard());
                     entity.setUnitId(unitOptional.get().getUnitId());
                     entity.setOwnerName(item.getUserName());
                     entity.setMobile(item.getMobile());
-                    epidemicUnitOwnerService.deleteByIdCard(item.getIdCard());
+
                     addOwner.add(entity);
                 } else {
                     Optional<EpidemicPlotBuildingResultDTO> buildingOptional = buildingList.stream().filter(build -> build.getPlotName().equals(item.getPlot()) && build.getBuildingName().equals(item.getBuildingNo())).findFirst();
@@ -824,13 +845,15 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
                         newUnit.setRoomNo(item.getRoomNo().trim().toUpperCase());
                         unitList.add(newUnit);
 
-                        EpidemicUnitOwnerEntity entity = new EpidemicUnitOwnerEntity();
-                        entity.setIdCard(item.getIdCard());
-                        entity.setUnitId(unitEntity.getId());
-                        entity.setOwnerName(item.getUserName());
-                        entity.setMobile(item.getMobile());
-                        epidemicUnitOwnerService.deleteByIdCard(item.getIdCard());
-                        addOwner.add(entity);
+                        if (StringUtils.isNotBlank(item.getIdCard())) {
+                            EpidemicUnitOwnerEntity entity = new EpidemicUnitOwnerEntity();
+                            entity.setIdCard(item.getIdCard());
+                            entity.setUnitId(unitOptional.get().getUnitId());
+                            entity.setOwnerName(item.getUserName());
+                            entity.setMobile(item.getMobile());
+                            epidemicUnitOwnerService.deleteByIdCard(item.getIdCard());
+                            addOwner.add(entity);
+                        }
                     }
                 }
             }