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 ReadListener