diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseController.java index 8ffd1c54e7..de8db9cc56 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseController.java +++ b/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.暂存文件 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseImportExcelDTO.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseImportExcelDTO.java index e707674fef..8507192422 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseImportExcelDTO.java +++ b/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,21 +48,21 @@ 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 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcEnterpriseExcelImportListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcEnterpriseExcelImportListener.java index 338e159b49..65b5cda5f0 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcEnterpriseExcelImportListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcEnterpriseExcelImportListener.java @@ -56,19 +56,20 @@ public class IcEnterpriseExcelImportListener implements ReadListener 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; @@ -313,7 +313,7 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl