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 c6dec5747..1d517db7e 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 @@ -472,16 +472,31 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl referencesColMap = new HashMap<>(); + Map referencesColConfigDataVOMap = new HashMap<>(); String referencesCol = collectManifestEO.getReferencesCol(); if (StringUtils.isNotBlank(referencesCol)) { - List referencesColVOList = getReferencesColList(controlType, referencesCol, collectManifestEO, userTypes); // 重新组合配置数据 + String[] referencesColArr = referencesCol.split("
"); + for (String col : referencesColArr) { + List referencesColVOList = getReferencesColList(controlType, col, collectManifestEO, userTypes); // 重新组合配置数据 + String key = UUID.randomUUID().toString().replaceAll("-",""); + referencesColConfigDataVOMap.put(key,referencesColVOList); + } + + referencesColMap.put("controlType", controlType); - referencesColMap.put("list", referencesColVOList); + referencesColMap.put("paramsConfigData", referencesColConfigDataVOMap); + + //referencesColMap.put("list", referencesColVOList); manifestMap.put("referencesCol", referencesColMap); } else { List referencesColVOList = getReferencesColList(controlType, " # # #", collectManifestEO, userTypes); // 重新组合配置数据 referencesColMap.put("controlType", controlType); - referencesColMap.put("list", referencesColVOList); + + String key = UUID.randomUUID().toString().replaceAll("-",""); + referencesColConfigDataVOMap.put(key,referencesColVOList); + referencesColMap.put("paramsConfigData", referencesColConfigDataVOMap); + + //referencesColMap.put("list", referencesColVOList); manifestMap.put("referencesCol", referencesColMap); } } @@ -5798,14 +5813,18 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl + if(StringUtils.isNotEmpty(referencesColBuilder.toString())){ + referencesColBuilder.append("
"); + } if (StringUtils.isNotEmpty(paramsReportConfigDataEO.getTextData())) { referencesColBuilder.append(paramsReportConfigDataEO.getTextData()).append("#"); } else { @@ -5824,19 +5843,20 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl manifestUpdateWrap = new LambdaUpdateWrapper<>();