140

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseController.java

@@ -235,7 +235,7 @@ public class IcEnterpriseController implements ResultDataResolver {
      * @return
      */
     @PostMapping("import")
-    public Result importExcel(@LoginUser TokenDto tokenDto, MultipartFile file) {
+    public Result importExcel(@LoginUser TokenDto tokenDto, @RequestPart("file") MultipartFile file) {
         String userId = EpmetRequestHolder.getHeader(AppClientConstant.USER_ID);
 
         // 1.暂存文件

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

@@ -17,26 +17,26 @@ public class EnterpriseImportExcelDTO {
      * 场所类型名称
      */
     @NotBlank(message = "场所类型不能为空")
-    @ExcelProperty(value = "*场所类型")
+    @ExcelProperty(value = "场所类型")
     private String placeTypeName;
 
 
     @NotBlank(message = "场所区域不能为空")
-    @ExcelProperty(value = "*场所区域")
+    @ExcelProperty(value = "场所区域")
     private String gridName;
 
     /**
      * 场所名称
      */
     @NotBlank(message = "场所名称不能为空")
-    @ExcelProperty(value = "*场所名称")
+    @ExcelProperty(value = "场所名称")
     private String placeOrgName;
 
     /**
      * 场所地址
      */
     @NotBlank(message = "场所地址不能为空")
-    @ExcelProperty(value = "*场所地址")
+    @ExcelProperty(value = "场所地址")
     private String address;
 
     /**
@@ -48,43 +48,43 @@ public class EnterpriseImportExcelDTO {
      * 4:100人以上】
      */
     @NotBlank(message = "规模不能为空")
-    @ExcelProperty(value = "*规模")
+    @ExcelProperty(value = "规模")
     private String scaleName;
 
     /**
      * 场所负责人
      */
     @NotBlank(message = "负责人不能为空")
-    @ExcelProperty(value = "*负责人")
+    @ExcelProperty(value = "负责人")
     private String personInCharge;
 
     /**
      * 负责人电话
      */
     @NotBlank(message = "联系电话不能为空")
-    @ExcelProperty(value = "*联系电话")
+    @ExcelProperty(value = "联系电话")
     private String mobile;
 
     @Data
     public static class ErrorRow {
 
         @ColumnWidth(20)
-        @ExcelProperty(value = "场所类型")
+        @ExcelProperty(value = "1场所类型")
         private String placeTypeName;
 
         @ColumnWidth(20)
-        @ExcelProperty(value = "场所区域")
+        @ExcelProperty(value = "2场所区域")
         private String gridName;
 
         @ColumnWidth(20)
-        @ExcelProperty(value = "场所名称")
+        @ExcelProperty(value = "3场所名称")
         private String placeOrgName;
 
         /**
          * 场所地址
          */
         @ColumnWidth(30)
-        @ExcelProperty(value = "场所地址")
+        @ExcelProperty(value = "4场所地址")
         private String address;
 
         @ColumnWidth(20)

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

@@ -12,6 +12,7 @@ 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;

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

@@ -313,7 +313,7 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl<IcEnterpriseDao, Ic
                 // 生成并上传错误文件
                 try {
                     // 文件生成
-                    Path errorDescDir = FileUtils.getAndCreateDirUnderEpmetFilesDir("ic_trip_preport", "import", "error_des");
+                    Path errorDescDir = FileUtils.getAndCreateDirUnderEpmetFilesDir("ic_enterprise", "import", "error_des");
                     String fileName = UUID.randomUUID().toString().concat(".xlsx");
                     errorDescFile = errorDescDir.resolve(fileName);