From f4ffd9b65f9ec0a4e7456a076381bd640e383454 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 12 May 2022 13:35:31 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=B1=85=E6=B0=91=E5=AF=BC=E5=87=BA=20shee?= =?UTF-8?q?t=E5=90=8D=E5=AD=97=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/IcResiUserExportServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java index 0edf48b55f..f5029f671c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java @@ -143,7 +143,7 @@ public class IcResiUserExportServiceImpl implements IcResiUserExportService { .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()) .registerWriteHandler(writeHandler).build(); - WriteSheet writeSheet = EasyExcel.writerSheet().head(exportConfigData.getHeaders()).build(); + WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").head(exportConfigData.getHeaders()).build(); String staffOrgPath = null; if (StringUtils.isNotBlank(staffInfoCacheResult.getAgencyPIds()) && !NumConstant.ZERO_STR.equals(staffInfoCacheResult.getAgencyPIds())) { From 2359f0ad99b43b9d03ef36b7625309af8fa10bb9 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 12 May 2022 15:35:43 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=A5=BC=E6=A0=8B=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=A0=87=E8=AE=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/ImportGeneralDTO.java | 6 +++ .../model/ImportBuildingInfoListener.java | 1 + .../impl/IcNeighborHoodServiceImpl.java | 42 ++++++++++--------- 3 files changed, 29 insertions(+), 20 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java index e91bf8e3a3..1bfeb17521 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java @@ -173,4 +173,10 @@ public class ImportGeneralDTO implements Serializable { * 排序 */ private BigDecimal sort; + + /** + * 是否更新状态，false：不更，true：更新 + */ + private Boolean buildingUpdateStatus = false; + private Boolean neighborHoodUpdateStatus = false; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java index df4d9d3243..c9b9140f9d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java @@ -87,6 +87,7 @@ public class ImportBuildingInfoListener extends AnalysisEventListener units = icBuildingUnitService.getUnitOptions(building.getId()); - Map unitMap = units.stream().collect(Collectors.toMap(OptionResultDTO::getCode, OptionResultDTO::getLabel)); - List unitList = new ArrayList<>(); - for (int i = 1; i <= info.getTotalUnitNum(); i++) { - String unitNum = String.valueOf(i); - if (!unitMap.containsKey(unitNum)) { - IcBuildingUnitEntity icBuildingUnit = new IcBuildingUnitEntity(); - icBuildingUnit.setId(IdWorker.getIdStr()); - icBuildingUnit.setBuildingId(building.getId()); - icBuildingUnit.setCustomerId(customerId); - icBuildingUnit.setUnitName(unitNum + "单元"); - icBuildingUnit.setUnitNum(unitNum); - unitList.add(icBuildingUnit); + if (info.getBuildingUpdateStatus()){ + if (info.getTotalUnitNum() < building.getTotalUnitNum()){ + info.setBuildingUnitNumStatus(true); + }else { + info.setBuildingId(building.getId()); + icBuildingService.updateBuilding(info); + //新增单元 + List units = icBuildingUnitService.getUnitOptions(building.getId()); + Map unitMap = units.stream().collect(Collectors.toMap(OptionResultDTO::getCode, OptionResultDTO::getLabel)); + List unitList = new ArrayList<>(); + for (int i = 1; i <= info.getTotalUnitNum(); i++) { + String unitNum = String.valueOf(i); + if (!unitMap.containsKey(unitNum)) { + IcBuildingUnitEntity icBuildingUnit = new IcBuildingUnitEntity(); + icBuildingUnit.setId(IdWorker.getIdStr()); + icBuildingUnit.setBuildingId(building.getId()); + icBuildingUnit.setCustomerId(customerId); + icBuildingUnit.setUnitName(unitNum + "单元"); + icBuildingUnit.setUnitNum(unitNum); + unitList.add(icBuildingUnit); + } } + icBuildingUnitService.insertBatch(unitList, NumConstant.ONE_HUNDRED); } - icBuildingUnitService.insertBatch(unitList, NumConstant.ONE_HUNDRED); } return building.getId(); }