From b9cd9a63c8a80936df47dfe8f3f717f0998ef051 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 20 Jun 2022 17:42:15 +0800 Subject: [PATCH] ..... --- .../com/epmet/excel/IcCityManagementExcel.java | 2 +- .../com/epmet/excel/IcPublicServiceExcel.java | 2 +- .../com/epmet/excel/IcSuperiorResourceExcel.java | 2 +- .../IcCityManagementExcelImportListener.java | 2 +- .../IcPublicServiceExcelImportListener.java | 2 +- .../IcSuperiorResourceExcelImportListener.java | 2 +- .../service/impl/IcCityManagementServiceImpl.java | 9 +++++---- .../impl/IcDangerousChemicalsServiceImpl.java | 15 ++++++++------- .../service/impl/IcPublicServiceServiceImpl.java | 9 +++++---- .../impl/IcSuperiorResourceServiceImpl.java | 9 +++++---- 10 files changed, 29 insertions(+), 25 deletions(-) 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 5cc3b6556f..808b0fc116 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 @@ -31,7 +31,7 @@ public class IcCityManagementExcel { @ExcelProperty(value = "容纳人数") @ColumnWidth(20) - private Integer capacityName; + private String capacityName; @ExcelProperty(value = "地址") @ColumnWidth(25) 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 9f3728cb22..eb8e247701 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 @@ -31,7 +31,7 @@ public class IcPublicServiceExcel { @ExcelProperty(value = "容纳人数") @ColumnWidth(20) - private Integer capacityName; + private String capacityName; @ExcelProperty(value = "地址") @ColumnWidth(25) 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 1f3b1a8667..9326adb2b4 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 @@ -31,7 +31,7 @@ public class IcSuperiorResourceExcel { @ExcelProperty(value = "容纳人数") @ColumnWidth(20) - private Integer capacityName; + private String capacityName; @ExcelProperty(value = "地址") @ColumnWidth(25) 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 d43dbff14d..8d48ad2888 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 @@ -74,7 +74,7 @@ public class IcCityManagementExcelImportListener implements ReadListener dictList = coverageService.dictMap(formDTO.getCustomerId(), "city_management"); Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getLabel, IcCoverageCategoryDictListResultDTO::getValue)); - for (IcCityManagementListResultDTO v : list) { - if (StringUtils.isNotBlank(v.getCategory())) { - v.setCategoryName(dictMap.get(v.getCategory())); - } + if (StringUtils.isNotBlank(resultDTO.getCategory())) { + resultDTO.setCategoryName(dictMap.get(resultDTO.getCategory())); } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java index a6d6782a36..cc3b942c8e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.enums.DictTypeEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; @@ -149,6 +150,7 @@ public class IcDangerousChemicalsServiceImpl extends BaseServiceImpl> statusRes = adminOpenFeignClient.dictMap(DictTypeEnum.IC_DANGER_TYPE.getCode()); Map statusMap = statusRes.success() && MapUtils.isNotEmpty(statusRes.getData()) ? statusRes.getData() : new HashMap<>(); //企业类别字典数据 List dictList = coverageService.dictMap(formDTO.getCustomerId(), "city_management"); Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getLabel, IcCoverageCategoryDictListResultDTO::getValue)); - for (IcDangerousChemicalsListResultDTO v : list) { - if (StringUtils.isNotBlank(v.getCategory())) { - v.setCategoryName(dictMap.get(v.getCategory())); - } - if (StringUtils.isNotBlank(v.getDangerType())) { - v.setDangerTypeName(statusMap.get(v.getDangerType())); - } + if (StringUtils.isNotBlank(resultDTO.getCategory())) { + resultDTO.setCategoryName(dictMap.get(resultDTO.getCategory())); + } + if (StringUtils.isNotBlank(resultDTO.getDangerType())) { + resultDTO.setDangerTypeName(statusMap.get(resultDTO.getDangerType())); } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPublicServiceServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPublicServiceServiceImpl.java index 46df592ea3..6c6ce20264 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPublicServiceServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPublicServiceServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; @@ -135,6 +136,7 @@ public class IcPublicServiceServiceImpl extends BaseServiceImpl dictList = coverageService.dictMap(formDTO.getCustomerId(), "public_service"); Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getLabel, IcCoverageCategoryDictListResultDTO::getValue)); - for (IcPublicServiceListResultDTO v : list) { - if (StringUtils.isNotBlank(v.getCategory())) { - v.setCategoryName(dictMap.get(v.getCategory())); - } + if (StringUtils.isNotBlank(resultDTO.getCategory())) { + resultDTO.setCategoryName(dictMap.get(resultDTO.getCategory())); } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcSuperiorResourceServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcSuperiorResourceServiceImpl.java index 8b6004b27b..fc862971c1 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcSuperiorResourceServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcSuperiorResourceServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; @@ -135,6 +136,7 @@ public class IcSuperiorResourceServiceImpl extends BaseServiceImpl dictList = coverageService.dictMap(formDTO.getCustomerId(), "superior_resource"); Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getLabel, IcCoverageCategoryDictListResultDTO::getValue)); - for (IcSuperiorResourceListResultDTO v : list) { - if (StringUtils.isNotBlank(v.getCategory())) { - v.setCategoryName(dictMap.get(v.getCategory())); - } + if (StringUtils.isNotBlank(resultDTO.getCategory())) { + resultDTO.setCategoryName(dictMap.get(resultDTO.getCategory())); } }