diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java index 1ec7fb64..23f54fe9 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java @@ -98,6 +98,9 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl list) { + // 查找所有企标 并转换成key为标准编号的map + LambdaQueryWrapper esWrapper = new LambdaQueryWrapper<>(); + esWrapper.eq(LawsEnterpriseStandard::getDelFlag, YesOrNoEnum.NO.getValue()); + Map> esMap = + esService.list(esWrapper).stream().collect(Collectors.groupingBy(LawsEnterpriseStandard::getStandardNumber)); + list.forEach(item -> { // 如果是制定则去除掉所有的原企标名称 原企标编号 if (ESPProjectType.ENACT.getValue().equals(item.getProjectType())) { @@ -542,6 +551,10 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl esList = esMap.get(item.getOriginEnStandardNo()); + if (esList != null && !esList.isEmpty()) { + item.setOriginEnStandardName(esList.get(0).getStandardName()); + } } }); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/entity/ProcessEsAnnualReport.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/entity/ProcessEsAnnualReport.java index 23d9cee4..c7fd0764 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/entity/ProcessEsAnnualReport.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/entity/ProcessEsAnnualReport.java @@ -235,6 +235,7 @@ public class ProcessEsAnnualReport implements Serializable { /** * 零部件名称 */ + @Excel(name = "零部件名称", width = 15, orderNum = "15") @Dict(dictTable = "laws_part_name", dicCode = "code", dicText = "name") @ApiModelProperty(value = "零部件名称") private String componentName; diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java index 49d5f077..330b11d8 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java @@ -98,6 +98,9 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl list) { + // 查找所有企标 并转换成key为标准编号的map + LambdaQueryWrapper esWrapper = new LambdaQueryWrapper<>(); + esWrapper.eq(LawsEnterpriseStandard::getDelFlag, YesOrNoEnum.NO.getValue()); + Map> esMap = + esService.list(esWrapper).stream().collect(Collectors.groupingBy(LawsEnterpriseStandard::getStandardNumber)); + list.forEach(item -> { // 如果是制定则去除掉所有的原企标名称 原企标编号 if (ESPProjectType.ENACT.getValue().equals(item.getProjectType())) { @@ -445,6 +454,10 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl esList = esMap.get(item.getOriginEnStandardNo()); + if (esList != null && !esList.isEmpty()) { + item.setOriginEnStandardName(esList.get(0).getStandardName()); + } } }); } @@ -543,6 +556,10 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl