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

参数清单收集-控件校验-引用参考列多行、展示引用参考列多行数据修改。

Browse Source
This commit is contained in:
wangzhijiang
2023-02-02 10:53:27 +08:00
parent b583789649
commit cac1a2f40c
1 changed files with 31 additions and 11 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
+31 -11
View File
@@ -472,16 +472,31 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
if (StringUtils.isNotEmpty(paramsManifestEO.getReferencesColName())) { if (StringUtils.isNotEmpty(paramsManifestEO.getReferencesColName())) {
Map<String, Object> referencesColMap = new HashMap<>(); Map<String, Object> referencesColMap = new HashMap<>();
Map<String,Object> referencesColConfigDataVOMap = new HashMap<>();
String referencesCol = collectManifestEO.getReferencesCol(); String referencesCol = collectManifestEO.getReferencesCol();
if (StringUtils.isNotBlank(referencesCol)) { 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("controlType", controlType);
referencesColMap.put("list", referencesColVOList); referencesColMap.put("paramsConfigData", referencesColConfigDataVOMap);
//referencesColMap.put("list", referencesColVOList);
manifestMap.put("referencesCol", referencesColMap); manifestMap.put("referencesCol", referencesColMap);
} else { } else {
List<ParamsConfigDataVO> referencesColVOList = getReferencesColList(controlType, " # # #", collectManifestEO, userTypes); // 重新组合配置数据 List<ParamsConfigDataVO> referencesColVOList = getReferencesColList(controlType, " # # #", collectManifestEO, userTypes); // 重新组合配置数据
referencesColMap.put("controlType", controlType); 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); manifestMap.put("referencesCol", referencesColMap);
} }
} }
@@ -5798,14 +5813,18 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
}*/ }*/
for (ParamsCollectManifestEO paramsCollectManifestEO : paramsCollectManifestEOList) { for (ParamsCollectManifestEO paramsCollectManifestEO : paramsCollectManifestEOList) {
StringBuilder referencesColBuilder = new StringBuilder();
// 参考列值设置为空标识 // 参考列值设置为空标识
boolean referencesColIsNullFlag = true; boolean referencesColIsNullFlag = true;
for (ParamsReportConfigDataEO paramsReportConfigDataEO : paramsReportConfigDataEOList) { for (ParamsReportConfigDataEO paramsReportConfigDataEO : paramsReportConfigDataEOList) {
if (StringUtils.equals(paramsCollectManifestEO.getNioNumber(),paramsReportConfigDataEO.getNioNumber())) { if (StringUtils.equals(paramsCollectManifestEO.getNioNumber(),paramsReportConfigDataEO.getNioNumber())) {
// 控件类型相同 才能引用 // 控件类型相同 才能引用
if (paramsCollectManifestEO.getControlType().equals(paramsReportConfigDataEO.getControlType())) { if (paramsCollectManifestEO.getControlType().equals(paramsReportConfigDataEO.getControlType())) {
// 如果拼接不为空 则是匹配到了多个 拼接换行符 </br>
StringBuilder referencesColBuilder = new StringBuilder(); if(StringUtils.isNotEmpty(referencesColBuilder.toString())){
referencesColBuilder.append("</br>");
}
if (StringUtils.isNotEmpty(paramsReportConfigDataEO.getTextData())) { if (StringUtils.isNotEmpty(paramsReportConfigDataEO.getTextData())) {
referencesColBuilder.append(paramsReportConfigDataEO.getTextData()).append("#"); referencesColBuilder.append(paramsReportConfigDataEO.getTextData()).append("#");
} else { } else {
@@ -5824,19 +5843,20 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
referencesColBuilder.append(" ").append("#"); referencesColBuilder.append(" ").append("#");
} }
String referencesCol = referencesColBuilder.toString();
ParamsCollectManifestEO updateCollectManifestEO = new ParamsCollectManifestEO();
updateCollectManifestEO.setId(paramsCollectManifestEO.getId());
updateCollectManifestEO.setReferencesCol(referencesCol);
updateEOList.add(updateCollectManifestEO);
referencesColIsNullFlag = false; referencesColIsNullFlag = false;
break;
} }
} }
} }
String referencesCol = referencesColBuilder.toString();
ParamsCollectManifestEO updateCollectManifestEO = new ParamsCollectManifestEO();
updateCollectManifestEO.setId(paramsCollectManifestEO.getId());
updateCollectManifestEO.setReferencesCol(referencesCol);
updateEOList.add(updateCollectManifestEO);
if(referencesColIsNullFlag){ if(referencesColIsNullFlag){
// 如果根据nio编号没有匹配到数据，将参考列的值设置为空 // 如果根据nio编号没有匹配到数据，将参考列的值设置为空
LambdaUpdateWrapper<ParamsCollectManifestEO> manifestUpdateWrap = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<ParamsCollectManifestEO> manifestUpdateWrap = new LambdaUpdateWrapper<>();