Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into 市北测试

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;
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java

@@ -87,6 +87,7 @@ public class ImportBuildingInfoListener extends AnalysisEventListener<BuildingIn
         num = num + NumConstant.ONE;
         ImportGeneralDTO dto = ConvertUtils.sourceToTarget(data, ImportGeneralDTO.class);
         dto.setNum(num);
+        dto.setBuildingUpdateStatus(true);
         dto.setCustomerId(formDTO.getCustomerId());
         info.setNum(num);
         if(StringUtils.isBlank(data.getAgencyName())){

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java

@@ -596,6 +596,7 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
         IcBuildingDTO building = icBuildingService.getBuildingInfo(info.getNeighborHoodId(), info.getBuildingName());
         if (null != building) {
             info.setBuildingExistStatus(true);
+            if (info.getBuildingUpdateStatus()){
                 if (info.getTotalUnitNum() < building.getTotalUnitNum()){
                     info.setBuildingUnitNumStatus(true);
                 }else {
@@ -619,6 +620,7 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
                     }
                     icBuildingUnitService.insertBatch(unitList, NumConstant.ONE_HUNDRED);
                 }
+            }
             return building.getId();
         }
         IcBuildingEntity buildingEntity = new IcBuildingEntity();

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())) {