diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java index cba6071ce..fa05eb446 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java @@ -82,8 +82,6 @@ public class CustomReportServiceImpl implements CustomReportService { private final ExcelRptTempMapper excelRptTempMapper; - private final ExcelRptMapper excelRptMapper; - private final EleEpdMapper eleEpdMapper; private final DeptTempMapper deptTempMapper; @@ -932,6 +930,10 @@ public class CustomReportServiceImpl implements CustomReportService { //处理指标是否合格 + reportLimitList = reportLimitList.stream() + .collect(Collectors.collectingAndThen(Collectors.toCollection( + () -> new TreeSet<>(Comparator.comparing(ReportTemplateDTO::getItemName))), ArrayList::new)); + Map limitMap = overLimitDeal(reportLimitList, reportSearchParam); //存放限值指标的map Map limitTargetMapX = reportLimitList.stream().collect(Collectors.toMap(ReportTemplateDTO::getItemName, Function.identity())); @@ -941,6 +943,10 @@ public class CustomReportServiceImpl implements CustomReportService { long deal = System.currentTimeMillis(); //开始组织sql + reportTemplateDTOList = reportTemplateDTOList.stream() + .collect(Collectors.collectingAndThen(Collectors.toCollection( + () -> new TreeSet<>(Comparator.comparing(ReportTemplateDTO::getItemName))), ArrayList::new)); + Map> classMap = reportTemplateDTOList.stream().collect(Collectors.groupingBy(ReportTemplateDTO::getClassId)); Map assNoPassMap = new HashMap<>(); classMap.forEach((classKey, templateValue) -> {