From ed169630260b996a0e549270fe1776441120fb32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Sun, 15 Oct 2023 16:14:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0=E5=A4=9A?= =?UTF-8?q?=E5=80=BC=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParamsCollectManifestEOServiceImpl.java | 27 ++++++++++++++----- ...msCollectManifestHistoryEOServiceImpl.java | 2 +- .../impl/ParamsManifestEOServiceImpl.java | 2 ++ .../mapper/xml/ParamsReportDetailEOMapper.xml | 1 + .../impl/ParamsReportDetailEOServiceImpl.java | 19 +++++++------ 5 files changed, 36 insertions(+), 15 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 768997041..fa85b61e3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -836,7 +836,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl paramsConfigDataVOList = this.getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据 - paramsConfigDataVO.put(paramsConfigDataEO.getId(), paramsConfigDataVOList); + paramsConfigDataVO.put(paramsConfigDataEO.getOrderNum() + "+" + paramsConfigDataEO.getId(), paramsConfigDataVOList); } }else{ ParamsConfigDataEO paramsConfigDataEO = this.getConfigDataEOByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId, paramsConfigDataEOList); // 参数配置数据 @@ -1631,14 +1631,22 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl configDataMap : paramsConfigDataVOMap.entrySet()) { List> paramsConfigDataVOList = (List>) configDataMap.getValue(); - + int orderNum = 0; + //顺序号不存在ID中，查询的时候会拼接 + String paramsConfigDataId = configDataMap.getKey(); + int plusIndex = paramsConfigDataId.indexOf("+"); + if (plusIndex != -1) { + orderNum = Integer.parseInt(paramsConfigDataId.substring(0, plusIndex)); + paramsConfigDataId = paramsConfigDataId.substring(plusIndex + 1); + } if (CollectionUtil.isNotEmpty(paramsConfigDataVOList)) { ParamsConfigDataEO paramsConfigDataEO = new ParamsConfigDataEO(); if (CollectionUtils.isNotEmpty(oldConfigDataEOList)) { + String finalParamsConfigDataId = paramsConfigDataId; List oldConfigDataEOs = oldConfigDataEOList.stream().filter(configData -> { boolean flag = false; - if (StringUtils.equals(configDataMap.getKey(), configData.getId())) { + if (StringUtils.equals(finalParamsConfigDataId, configData.getId())) { flag = true; } return flag; @@ -1648,8 +1656,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl paramsConfigDataVO : paramsConfigDataVOList) { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java index b54d7325b..804fdabdf 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java @@ -177,7 +177,7 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl paramsConfigDataVOList = this.getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据 - paramsConfigDataVO.put(paramsConfigDataEO.getId(), paramsConfigDataVOList); + paramsConfigDataVO.put(paramsConfigDataEO.getOrderNum()+"+"+paramsConfigDataEO.getId(), paramsConfigDataVOList); } }else{ ParamsConfigDataHistoryEO paramsConfigDataEO = this.getConfigDataEOByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId, paramsConfigDataEOList); // 参数配置数据 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java index 0cbc8deb9..818117a0d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java @@ -723,6 +723,7 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl 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 2786b024c..3e0003063 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 @@ -234,7 +234,7 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl paramsConfigDataEOList = this.paramsReportConfigDataEOService.queryListByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据 if(CollectionUtils.isNotEmpty(paramsConfigDataEOList)){ // 匿名比较器排序 @@ -249,7 +249,7 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl paramsConfigDataVOList = this.getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据 - paramsConfigDataVO.put(paramsConfigDataEO.getId(),paramsConfigDataVOList); + paramsConfigDataVO.put(paramsConfigDataEO.getOrderNum()+"+"+paramsConfigDataEO.getId(),paramsConfigDataVOList); } } @@ -1876,14 +1876,18 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl paramsConfigDataVOMap = (Map) paramsReportConfigDataMap.get("paramsConfigData"); for (Map.Entry paramsConfigDataMap : paramsConfigDataVOMap.entrySet()) { + //顺序号不存在ID中，查询的时候会拼接 String configDataId = paramsConfigDataMap.getKey(); + List> configDataVOList = (List>) paramsConfigDataMap.getValue(); - - if (CollectionUtil.isNotEmpty(configDataVOList)) { - Integer orderNum = (Integer) configDataVOList.get(0).get("orderNum"); - + int orderNum = (Integer) configDataVOList.get(0).get("orderNum"); + int plusIndex = configDataId.indexOf("+"); + if (plusIndex != -1) { + configDataId = configDataId.substring(plusIndex + 1); + orderNum = Integer.parseInt(configDataId.substring(0, plusIndex)); + } ParamsReportConfigDataEO paramsReportConfigDataEO = new ParamsReportConfigDataEO(); paramsReportConfigDataEO.setOrderNum(orderNum); for (Map paramsConfigDataVO : configDataVOList) { @@ -2053,7 +2057,6 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl prcdEoList = this.paramsReportConfigDataEOService.list(prcdQueryWrap); if(CollectionUtils.isNotEmpty(prcdEoList)){ - List paramsConfigDataIdList = paramsConfigDataVOMap.entrySet().stream().map(e -> e.getKey()).distinct().collect(Collectors.toList()); + List paramsConfigDataIdList = paramsConfigDataVOMap.entrySet().stream().map(e -> e.getKey().split("\\+")[0]).distinct().collect(Collectors.toList()); List newAddPcdDataIdList = paramsConfigDataVOMap.entrySet().stream().map(e -> e.getKey()).filter(e -> { boolean flag = false;