WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改参数导出顺序问题

Browse Source
This commit is contained in:
gaosong
2023-10-22 18:54:44 +08:00
parent fd16446f7e
commit 7febc32e20
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+4 -2
View File
@@ -797,10 +797,12 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
String referencesCol = collectManifestEO.getReferencesCol();
if (StringUtils.isNotBlank(referencesCol)) {
String[] referencesColArr = referencesCol.split("</br>");
int index = 0;
for (String col : referencesColArr) {
List<ParamsConfigDataVO> referencesColVOList = getReferencesColList(controlType, col, collectManifestEO, userTypes); // 重新组合配置数据
String key = UUID.randomUUID().toString().replaceAll("-","");
String key = index+"+"+UUID.randomUUID().toString().replaceAll("-","");
referencesColConfigDataVOMap.put(key,referencesColVOList);
index++;
}
referencesColMap.put("controlType", controlType);
@@ -810,7 +812,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
List<ParamsConfigDataVO> referencesColVOList = getReferencesColList(controlType, " # # #", collectManifestEO, userTypes); // 重新组合配置数据
referencesColMap.put("controlType", controlType);
String key = UUID.randomUUID().toString().replaceAll("-","");
String key = "0+"+UUID.randomUUID().toString().replaceAll("-","");
referencesColConfigDataVOMap.put(key,referencesColVOList);
referencesColMap.put("paramsConfigData", referencesColConfigDataVOMap);
manifestMap.put("referencesCol", referencesColMap);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataEOServiceImpl.java
+1
View File
@@ -110,6 +110,7 @@ public class ParamsConfigDataEOServiceImpl extends ServiceImpl<ParamsConfigDataE
LambdaQueryWrapper<ParamsConfigDataEO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ParamsConfigDataEO::getParamsConfigId, paramsConfigId);
queryWrapper.eq(ParamsConfigDataEO::getParamsCollectManifestId, paramsCollectManifestId);
queryWrapper.orderByAsc(ParamsConfigDataEO::getOrderNum);
return this.list(queryWrapper);
}