From a20562d78bd9fdc1200a569d4177ec34df4993d2 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Fri, 15 Apr 2022 16:52:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A5=BC=E6=A0=8B=E7=BC=96=E8=BE=91=E5=8D=95?=
 =?UTF-8?q?=E5=85=83=E6=95=B0=E6=97=B6=EF=BC=8C=E4=BB=8E=E5=A4=B4=E5=BC=80?=
 =?UTF-8?q?=E5=A7=8B=E6=96=B0=E5=A2=9E=E5=8D=95=E5=85=83=EF=BC=8C=E5=A6=82?=
 =?UTF-8?q?=E6=9E=9C=E5=8E=9F=E5=85=88=E5=B7=B2=E5=AD=98=E5=9C=A8=EF=BC=8C?=
 =?UTF-8?q?=E5=88=99=E7=95=A5=E8=BF=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tools/dto/result/OptionResultDTO.java     |  1 +
 .../service/impl/BuildingServiceImpl.java     | 20 ++++++++++++-------
 .../impl/IcBuildingUnitServiceImpl.java       |  1 +
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionResultDTO.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionResultDTO.java
index 8c42570bc3..95741eb813 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionResultDTO.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionResultDTO.java
@@ -14,6 +14,7 @@ import java.util.List;
 public class OptionResultDTO implements Serializable {
     private static final long serialVersionUID = 8618231166600518980L;
     private String label;
+    private String code;
     private String value;
     private String pValue;
     private String sysDictDataId;
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java
index 04670fde28..3511bfc536 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java
@@ -12,6 +12,7 @@ import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
+import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
@@ -537,14 +538,19 @@ public class BuildingServiceImpl implements BuildingService {
         Integer unit = icBuilding.getTotalUnitNum();
         if(nowUnit>=unit){
             //新增单元
+            List<OptionResultDTO> units = icBuildingUnitService.getUnitOptions(icBuilding.getId());
+            Map<String, String> unitMap = units.stream().collect(Collectors.toMap(OptionResultDTO::getCode, OptionResultDTO::getLabel));
             List<IcBuildingUnitEntity> unitList = new ArrayList<>();
-            for(int i =unit ;i<nowUnit;i++){
-                IcBuildingUnitEntity icBuildingUnit= new IcBuildingUnitEntity();
-                icBuildingUnit.setBuildingId(icBuilding.getId());
-                icBuildingUnit.setCustomerId(customerId);
-                icBuildingUnit.setUnitName((i + 1) +"单元");
-                icBuildingUnit.setUnitNum(String.valueOf(i+1));
-                unitList.add(icBuildingUnit);
+            for(int i = 1 ;i<nowUnit;i++){
+                String unitNum = String.valueOf(i);
+                if (!unitMap.containsKey(unitNum)) {
+                    IcBuildingUnitEntity icBuildingUnit = new IcBuildingUnitEntity();
+                    icBuildingUnit.setBuildingId(icBuilding.getId());
+                    icBuildingUnit.setCustomerId(customerId);
+                    icBuildingUnit.setUnitName(unitNum + "单元");
+                    icBuildingUnit.setUnitNum(unitNum);
+                    unitList.add(icBuildingUnit);
+                }
             }
             icBuildingUnitService.insertBatch(unitList);
         }else{
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingUnitServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingUnitServiceImpl.java
index ae1fd471a9..2e800bbda5 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingUnitServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingUnitServiceImpl.java
@@ -128,6 +128,7 @@ public class IcBuildingUnitServiceImpl extends BaseServiceImpl<IcBuildingUnitDao
         return list.stream().map(item -> {
             OptionResultDTO dto = new OptionResultDTO();
             dto.setValue(item.getId());
+            dto.setCode(item.getUnitNum());
             dto.setLabel(item.getUnitName());
             return dto;
         }).collect(Collectors.toList());