导入end

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

@@ -69,22 +69,22 @@ public class EnterpriseImportExcelDTO {
     public static class ErrorRow {
 
         @ColumnWidth(20)
-        @ExcelProperty(value = "1场所类型")
+        @ExcelProperty(value = "场所类型")
         private String placeTypeName;
 
         @ColumnWidth(20)
-        @ExcelProperty(value = "2场所区域")
+        @ExcelProperty(value = "场所区域")
         private String gridName;
 
         @ColumnWidth(20)
-        @ExcelProperty(value = "3场所名称")
+        @ExcelProperty(value = "场所名称")
         private String placeOrgName;
 
         /**
          * 场所地址
          */
         @ColumnWidth(30)
-        @ExcelProperty(value = "4场所地址")
+        @ExcelProperty(value = "场所地址")
         private String address;
 
         @ColumnWidth(20)

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

@@ -12,7 +12,6 @@ import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.entity.IcEnterpriseEntity;
 import com.epmet.excel.EnterpriseImportExcelDTO;
 import com.epmet.service.impl.IcEnterpriseServiceImpl;
-import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.ArrayList;
@@ -57,19 +56,20 @@ public class IcEnterpriseExcelImportListener implements ReadListener<EnterpriseI
     public void invoke(EnterpriseImportExcelDTO data, AnalysisContext context) {
 
         try {
+            // log.warn("有数据吗？"+JSON.toJSONString(data));
             // 不能为空先校验数据
             ValidatorUtils.validateEntity(data);
             // 去除空格
             ObjectUtil.objectToTrim(data);
             // 根据网格名是否能找到网格id
             if (!gridMap.containsKey(data.getGridName())) {
-                throw new ValidateException(String.format("您所在的组织，%s不存在", data.getGridName()));
+                throw new ValidateException(String.format("您所在的组织，不存在【%s】", data.getGridName()));
             }
             if(!placeTypeMap.containsKey(data.getPlaceTypeName())){
-                throw new ValidateException(String.format("%s场所类型不存在",data.getPlaceTypeName()));
+                throw new ValidateException(String.format("【%s】场所类型不存在",data.getPlaceTypeName()));
             }
             if(!scaleMap.containsKey(data.getScaleName())){
-                throw new ValidateException(String.format("%s规模不存在",data.getScaleName()));
+                throw new ValidateException(String.format("【%s】规模不存在",data.getScaleName()));
             }
             IcEnterpriseEntity enterpriseEntity = ConvertUtils.sourceToTarget(data, IcEnterpriseEntity.class);
             enterpriseEntity.setCustomerId(currentCustomerId);

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

@@ -300,9 +300,9 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl<IcEnterpriseDao, Ic
             }
             Map<String,String> gridMap=gridList.stream().collect(Collectors.toMap(GridListResultDTO::getGridName,GridListResultDTO::getGridId));
 
-            IcEnterpriseExcelImportListener listener = new IcEnterpriseExcelImportListener(customerId,staffInfo, this,placeTypeMap,scaleMap,gridMap);
 
-            EasyExcel.read(filePath.toFile(), EnterpriseImportExcelDTO.class, listener).headRowNumber(2).sheet(0).doRead();
+            IcEnterpriseExcelImportListener listener = new IcEnterpriseExcelImportListener(customerId,staffInfo, this,placeTypeMap,scaleMap,gridMap);
+            EasyExcel.read(filePath.toFile(), EnterpriseImportExcelDTO.class, listener).headRowNumber(1).sheet(0).doRead();
 
             Path errorDescFile = null;
             String errorDesFileUrl = null;