From 98b68bc66d342fbf779d2592123b68cf6aa4bcaf Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 22 Jun 2022 17:53:38 +0800 Subject: [PATCH 1/2] 140 --- .../controller/IcEnterpriseController.java | 2 +- .../epmet/excel/EnterpriseImportExcelDTO.java | 22 +++++++++---------- .../IcEnterpriseExcelImportListener.java | 1 + .../service/impl/IcEnterpriseServiceImpl.java | 2 +- 4 files changed, 14 insertions(+), 13 deletions(-) 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..c3a666b4ba 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,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) 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..5263746016 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 @@ -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; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java index c4fb9441bd..9b0fbb171c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java +++ b/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 Date: Wed, 22 Jun 2022 19:04:20 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AF=BC=E5=85=A5end?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/excel/EnterpriseImportExcelDTO.java | 8 ++++---- .../excel/handler/IcEnterpriseExcelImportListener.java | 8 ++++---- .../com/epmet/service/impl/IcEnterpriseServiceImpl.java | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) 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 c3a666b4ba..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 @@ -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) 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 5263746016..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 @@ -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 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;