From f5755e08a7e821241a876c793639a97039262821 Mon Sep 17 00:00:00 2001
From: wangzhijiang <wangzhijiang1314>
Date: Thu, 23 Mar 2023 10:27:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E5=8F=82=E6=95=B0=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=E9=85=8D=E7=BD=AE=E5=88=97=E5=90=88=E5=B9=B6=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ParamsCollectManifestEOServiceImpl.java   | 49 ++++++++++++++++---
 1 file changed, 41 insertions(+), 8 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 af7f1621f..97ab1d71f 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
@@ -773,29 +773,62 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
             if (StringUtils.isNotEmpty(paramsManifestEO.getReferencesColName())) {
                 Map<String, Object> referencesColMap = new HashMap<>();
+                referencesColMap.put("referencesColFlag",true);
+                Map<String,Object> referencesColConfigDataVOMap = new HashMap<>();
                 String referencesCol = collectManifestEO.getReferencesCol();
                 if (StringUtils.isNotBlank(referencesCol)) {
-                    List<ParamsConfigDataVO> referencesColVOList = getReferencesColList(controlType, referencesCol, collectManifestEO, userTypes); // 重新组合配置数据
+                    String[] referencesColArr = referencesCol.split("</br>");
+                    for (String col : referencesColArr) {
+                        List<ParamsConfigDataVO> 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);
                     manifestMap.put("referencesCol", referencesColMap);
                 } else {
                     List<ParamsConfigDataVO> 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);
                     manifestMap.put("referencesCol", referencesColMap);
                 }
             }
 
             if (CollectionUtil.isNotEmpty(paramsConfigEOList)) {
                 paramsConfigEOList.forEach(paramsConfigEO -> { // 参数配置
+                    Map<String, Object> paramsConfigDataVO = new HashMap<>();
                     Map<String, Object> configMap = new HashMap<>();
                     String paramsConfigId = paramsConfigEO.getId();
-                    ParamsConfigDataEO paramsConfigDataEO = getConfigDataEOByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId, paramsConfigDataEOList); // 参数配置数据
-                    List<ParamsConfigDataVO> paramsConfigDataVOList = getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据
-                    configMap.put("controlType", controlType);
-                    configMap.put("list", paramsConfigDataVOList);
-                    manifestMap.put(paramsConfigEO.getId(), configMap);
+                    List<ParamsConfigDataEO> paramsConfigDatas = this.getConfigDataEOListByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId, paramsConfigDataEOList); // 参数配置数据
+                    if(CollectionUtils.isNotEmpty(paramsConfigDatas)){
+                        // 匿名比较器排序
+                        Collections.sort(paramsConfigDatas, new Comparator<ParamsConfigDataEO>() {
+                            @Override
+                            public int compare(ParamsConfigDataEO p1, ParamsConfigDataEO p2) {
+                                if (p2.getOrderNum() == null || p1.getOrderNum() == null) {
+                                    return 0;
+                                }
+                                return p1.getOrderNum().compareTo(p2.getOrderNum());
+                            }
+                        });
+                        for (ParamsConfigDataEO paramsConfigDataEO : paramsConfigDatas) {
+                            List<ParamsConfigDataVO> paramsConfigDataVOList = this.getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据
+                            paramsConfigDataVO.put(paramsConfigDataEO.getId(), paramsConfigDataVOList);
+                        }
+                    }else{
+                        ParamsConfigDataEO paramsConfigDataEO = this.getConfigDataEOByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId, paramsConfigDataEOList); // 参数配置数据
+                        List<ParamsConfigDataVO> paramsConfigDataVOList = this.getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据
+                        String key = UUID.randomUUID().toString().replaceAll("-", "");
+                        paramsConfigDataVO.put(key, paramsConfigDataVOList);
+                    }
+                    configMap.put("controlType",controlType);
+                    configMap.put("paramsConfigData",paramsConfigDataVO);
+                    configMap.put("configId",paramsConfigEO.getId());
+                    manifestMap.put(paramsConfigEO.getId(),configMap);
 
                     configIdList.add(paramsConfigEO.getId());
                 });