diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigDataEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigDataEOService.java index 94b9c8c6c..ab3698f26 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigDataEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigDataEOService.java @@ -39,4 +39,7 @@ public interface IParamsReportConfigDataEOService extends IService paramsReportDetailIdList); + + + List queryListByCollectManifestIdList(List paramsCollectManifestIdList); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java index 7168c6649..0f72783e3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java @@ -78,4 +78,19 @@ public class ParamsReportConfigDataEOServiceImpl extends ServiceImpl queryListByCollectManifestIdList(List paramsCollectManifestIdList) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.in(ParamsReportConfigDataEO::getParamsCollectManifestId, paramsCollectManifestIdList); + queryWrapper.orderByDesc(ParamsReportConfigDataEO::getOrderNum); + return this.list(queryWrapper); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java index 4acc8c899..2786b024c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java @@ -154,6 +154,9 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl collectManifestIdList = list.stream().map(ParamsReportDetailEO::getId).distinct().collect(Collectors.toList()); + List paramsReportConfigDataEOList = this.paramsReportConfigDataEOService.queryListByCollectManifestIdList(collectManifestIdList); + List> listMap = new ArrayList<>(); list.forEach(collectManifestEO -> { // 参数收集清单 @@ -225,7 +228,14 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl configMap = new HashMap<>(); String paramsConfigId = paramsConfigEO.getId(); - List paramsConfigDataEOList = this.paramsReportConfigDataEOService.queryListByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据 + List paramsConfigDataEOList = paramsReportConfigDataEOList.stream().filter(prcdEO -> { + boolean flag = false; + if (StringUtils.equals(prcdEO.getParamsConfigId(),paramsConfigId) && StringUtils.equals(prcdEO.getParamsCollectManifestId(),paramsCollectManifestId)) { + flag = true; + } + return flag; + }).distinct().collect(Collectors.toList()); +// List paramsConfigDataEOList = this.paramsReportConfigDataEOService.queryListByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据 if(CollectionUtils.isNotEmpty(paramsConfigDataEOList)){ // 匿名比较器排序 Collections.sort(paramsConfigDataEOList, new Comparator() {