From e0c09eaba354680bddfa4158341070e7e4f71b8a Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 21 Jun 2022 11:08:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/constants/ImportTaskConstants.java | 12 ++++++++++++ .../IcCityManagementController.java | 2 +- .../controller/IcPublicServiceController.java | 2 +- .../IcSuperiorResourceController.java | 2 +- .../epmet/excel/IcCityManagementExcel.java | 8 ++++---- .../com/epmet/excel/IcPublicServiceExcel.java | 8 ++++---- .../epmet/excel/IcSuperiorResourceExcel.java | 6 +++--- .../IcCityManagementExcelImportListener.java | 3 +++ .../IcPublicServiceExcelImportListener.java | 3 +++ ...IcSuperiorResourceExcelImportListener.java | 3 +++ .../impl/IcCityManagementServiceImpl.java | 5 +++-- .../impl/IcPublicServiceServiceImpl.java | 5 +++-- .../impl/IcSuperiorResourceServiceImpl.java | 5 +++-- .../excel/city_management_template.xlsx | Bin 9032 -> 9069 bytes .../excel/public_service_template.xlsx | Bin 9065 -> 9096 bytes .../excel/superior_resource_template.xlsx | Bin 10434 -> 9283 bytes 16 files changed, 44 insertions(+), 20 deletions(-) diff --git a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java index 86417c86ea..d5bdbc67f6 100644 --- a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java +++ b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java @@ -47,4 +47,16 @@ public interface ImportTaskConstants { * 处理状态:完成,但未完全成功 */ String PROCESS_STATUS_FINISHED_FAIL = "finished_fail"; + /** + * 优势资源 + */ + String IC_SUPERIOR_RESOURCE = "ic_superior_resource"; + /** + * 公共服务 + */ + String IC_PUBLIC_SERVICE = "ic_public_service"; + /** + * 城市管理 + */ + String IC_CITY_MANAGEMENT = "ic_city_management"; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcCityManagementController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcCityManagementController.java index 04862f1752..7cde94ba86 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcCityManagementController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcCityManagementController.java @@ -197,7 +197,7 @@ public class IcCityManagementController implements ResultDataResolver { // 2.生成导入任务记录 ImportTaskCommonResultDTO rstData = getResultDataOrThrowsException( - ImportTaskUtils.createImportTask(originalFilename, ImportTaskConstants.BIZ_TYPE_IC_VACCINE), + ImportTaskUtils.createImportTask(originalFilename, ImportTaskConstants.IC_CITY_MANAGEMENT), ServiceConstant.EPMET_COMMON_SERVICE, EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "excel导入优势资源管理信息错误", diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPublicServiceController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPublicServiceController.java index 71f9fe324b..add08dbce3 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPublicServiceController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPublicServiceController.java @@ -198,7 +198,7 @@ public class IcPublicServiceController implements ResultDataResolver { // 2.生成导入任务记录 ImportTaskCommonResultDTO rstData = getResultDataOrThrowsException( - ImportTaskUtils.createImportTask(originalFilename, ImportTaskConstants.BIZ_TYPE_IC_VACCINE), + ImportTaskUtils.createImportTask(originalFilename, ImportTaskConstants.IC_PUBLIC_SERVICE), ServiceConstant.EPMET_COMMON_SERVICE, EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "excel导入优势资源管理信息错误", diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcSuperiorResourceController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcSuperiorResourceController.java index df66d7a734..57fb3f1d60 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcSuperiorResourceController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcSuperiorResourceController.java @@ -198,7 +198,7 @@ public class IcSuperiorResourceController implements ResultDataResolver { // 2.生成导入任务记录 ImportTaskCommonResultDTO rstData = getResultDataOrThrowsException( - ImportTaskUtils.createImportTask(originalFilename, ImportTaskConstants.BIZ_TYPE_IC_VACCINE), + ImportTaskUtils.createImportTask(originalFilename, ImportTaskConstants.IC_SUPERIOR_RESOURCE), ServiceConstant.EPMET_COMMON_SERVICE, EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "excel导入优势资源管理信息错误", diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcCityManagementExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcCityManagementExcel.java index 808b0fc116..ffda552a3f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcCityManagementExcel.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcCityManagementExcel.java @@ -20,12 +20,12 @@ public class IcCityManagementExcel { @NotBlank(message = "场所名称为必填项") private String name; - @ExcelProperty(value = "场所类别") + @ExcelProperty(value = "场所分类") @ColumnWidth(20) - @NotBlank(message = "场所类别为必填项") + @NotBlank(message = "场所分类为必填项") private String categoryName; - @ExcelProperty(value = "占地面积") + @ExcelProperty(value = "占地面积(平方公里)") @ColumnWidth(25) private String areaCoveredName; @@ -45,7 +45,7 @@ public class IcCityManagementExcel { @ColumnWidth(20) private String name; - @ExcelProperty("场所类别") + @ExcelProperty("场所分类") @ColumnWidth(20) private String categoryName; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcPublicServiceExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcPublicServiceExcel.java index eb8e247701..3b9762b677 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcPublicServiceExcel.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcPublicServiceExcel.java @@ -20,12 +20,12 @@ public class IcPublicServiceExcel { @NotBlank(message = "场所名称为必填项") private String name; - @ExcelProperty(value = "场所类别") + @ExcelProperty(value = "场所分类") @ColumnWidth(20) - @NotBlank(message = "场所类别为必填项") + @NotBlank(message = "场所分类为必填项") private String categoryName; - @ExcelProperty(value = "占地面积") + @ExcelProperty(value = "占地面积(平方公里)") @ColumnWidth(25) private String areaCoveredName; @@ -45,7 +45,7 @@ public class IcPublicServiceExcel { @ColumnWidth(20) private String name; - @ExcelProperty("场所类别") + @ExcelProperty("场所分类") @ColumnWidth(20) private String categoryName; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcSuperiorResourceExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcSuperiorResourceExcel.java index 9326adb2b4..4a6c08bd31 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcSuperiorResourceExcel.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcSuperiorResourceExcel.java @@ -20,12 +20,12 @@ public class IcSuperiorResourceExcel { @NotBlank(message = "场所名称为必填项") private String name; - @ExcelProperty(value = "场所类别") + @ExcelProperty(value = "场所分类") @ColumnWidth(20) @NotBlank(message = "场所类别为必填项") private String categoryName; - @ExcelProperty(value = "占地面积") + @ExcelProperty(value = "占地面积(平方公里)") @ColumnWidth(25) private String areaCoveredName; @@ -45,7 +45,7 @@ public class IcSuperiorResourceExcel { @ColumnWidth(20) private String name; - @ExcelProperty("场所类别") + @ExcelProperty("场所分类") @ColumnWidth(20) private String categoryName; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcCityManagementExcelImportListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcCityManagementExcelImportListener.java index 8d48ad2888..2c4b0b4546 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcCityManagementExcelImportListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcCityManagementExcelImportListener.java @@ -71,6 +71,9 @@ public class IcCityManagementExcelImportListener implements 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 X00031AOHXWsFPPCD+Wv-000001uM*j diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/superior_resource_template.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/superior_resource_template.xlsx index 4b4540287db3094ae1ac0c7574a6032f87ef28e2..d9dff560d75afa998969a8371a62efca8b31d05e 100644 GIT binary patch delta 6128 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