企事业单位导入修改

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseImportExcelDTO.java

@@ -27,7 +27,7 @@ public class EnterpriseImportExcelDTO {
      * 默认0
      */
     @NotBlank(message = "场所类别不能为空")
-    @ExcelProperty(value = "场所类别(九小场所/企事业单位)")
+    @ExcelProperty(value = "场所类别")
     private String placeCategoryName;
 
 
@@ -56,10 +56,11 @@ public class EnterpriseImportExcelDTO {
      * 2:21-40人
      * 3:41-100人
      * 4:100人以上】
+     * 改为手输数字了
      */
     @NotBlank(message = "规模不能为空")
     @ExcelProperty(value = "规模")
-    private String scaleName;
+    private Integer scaleTotal;
 
     /**
      * 场所负责人
@@ -108,7 +109,7 @@ public class EnterpriseImportExcelDTO {
 
         @ColumnWidth(20)
         @ExcelProperty(value = "规模")
-        private String scaleName;
+        private Integer scaleTotal;
 
         @ColumnWidth(20)
         @ExcelProperty(value = "负责人")

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcEnterpriseExcelImportListener.java

@@ -54,6 +54,12 @@ public class IcEnterpriseExcelImportListener implements ReadListener<EnterpriseI
         this.gridMap=gridMap;
     }
 
+    @Override
+    public void doAfterAllAnalysed(AnalysisContext context) {
+        // 最后几条达不到阈值，这里必须再调用一次
+        execPersist();
+    }
+
     @Override
     public void invoke(EnterpriseImportExcelDTO data, AnalysisContext context) {
 
@@ -70,9 +76,9 @@ public class IcEnterpriseExcelImportListener implements ReadListener<EnterpriseI
             if(!placeTypeMap.containsKey(data.getPlaceTypeName())){
                 throw new ValidateException(String.format("【%s】场所类型不存在",data.getPlaceTypeName()));
             }
-            if(!scaleMap.containsKey(data.getScaleName())){
+            /*if(!scaleMap.containsKey(data.getScaleName())){
                 throw new ValidateException(String.format("【%s】规模不存在",data.getScaleName()));
-            }
+            }*/
             IcEnterpriseEntity enterpriseEntity = ConvertUtils.sourceToTarget(data, IcEnterpriseEntity.class);
             enterpriseEntity.setCustomerId(currentCustomerId);
             //网格id
@@ -85,7 +91,8 @@ public class IcEnterpriseExcelImportListener implements ReadListener<EnterpriseI
             enterpriseEntity.setLongitude(StrConstant.EPMETY_STR);
             enterpriseEntity.setLatitude(StrConstant.EPMETY_STR);
             //规模
-            enterpriseEntity.setScale(scaleMap.get(data.getScaleName()));
+            // enterpriseEntity.setScale(scaleMap.get(data.getScaleName()));
+            enterpriseEntity.setScaleTotal(data.getScaleTotal());
             enterpriseEntity.setPlaceCategory("九小场所".equals(data.getPlaceCategoryName()) ? "0" : "1");
 
             //网格id+场所名称
@@ -121,7 +128,7 @@ public class IcEnterpriseExcelImportListener implements ReadListener<EnterpriseI
             errorRow.setGridName(data.getGridName());
             errorRow.setPlaceOrgName(data.getPlaceOrgName());
             errorRow.setAddress(data.getAddress());
-            errorRow.setScaleName(data.getScaleName());
+            errorRow.setScaleTotal(data.getScaleTotal());
             errorRow.setPersonInCharge(data.getPersonInCharge());
             errorRow.setMobile(data.getMobile());
             errorRow.setErrorInfo(errorMsg);
@@ -129,12 +136,6 @@ public class IcEnterpriseExcelImportListener implements ReadListener<EnterpriseI
         }
     }
 
-    @Override
-    public void doAfterAllAnalysed(AnalysisContext context) {
-        // 最后几条达不到阈值，这里必须再调用一次
-        execPersist();
-    }
-
     /**
      * 执行持久化
      */

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

@@ -28,7 +28,6 @@ import com.epmet.commons.tools.utils.*;
 import com.epmet.constant.SmsTemplateConstant;
 import com.epmet.constants.ImportTaskConstants;
 import com.epmet.dao.*;
-import com.epmet.dto.SysDictDataDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.entity.*;
@@ -365,8 +364,9 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl<IcEnterpriseDao, Ic
             List<IcCoverageCategoryDictListResultDTO> dictList = coverageService.dictMap(customerId, CoveragePlaceTypeEnum.ENTERPRISE_PATROL.getCode());
             Map<String, String> placeTypeMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getLabel, IcCoverageCategoryDictListResultDTO::getValue));
             //2、规模名称
-            Result<List<SysDictDataDTO>> dictMapRes = adminOpenFeignClient.dictDataList(DictTypeEnum.SCALE.getCode());
+            // Result<List<SysDictDataDTO>> dictMapRes = adminOpenFeignClient.dictDataList(DictTypeEnum.SCALE.getCode());
-            Map<String, String> scaleMap = dictMapRes.success() && CollectionUtils.isNotEmpty(dictMapRes.getData()) ? dictMapRes.getData().stream().collect(Collectors.toMap(SysDictDataDTO::getDictLabel, SysDictDataDTO::getDictValue)) : new HashMap<>();
+            // Map<String, String> scaleMap = dictMapRes.success() && CollectionUtils.isNotEmpty(dictMapRes.getData()) ? dictMapRes.getData().stream().collect(Collectors.toMap(SysDictDataDTO::getDictLabel, SysDictDataDTO::getDictValue)) : new HashMap<>();
+            Map<String, String> scaleMap=new HashMap<>();
             //3、当前工作人员所属组织下的网格列表
             List<GridListResultDTO> gridList = customerGridDao.selectGridList(staffInfo.getAgencyId());
             if (CollectionUtils.isEmpty(gridList)) {