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

64523、64518bug处理。

Browse Source
This commit is contained in:
wangzhijiang
2022-12-29 15:20:56 +08:00
parent daf9a5483c
commit b574bd6ac7
1 changed files with 53 additions and 1 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
+53 -1
View File
@@ -1232,6 +1232,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
paramsConfigDataEO.setParamsCollectManifestId(paramsCollectManifestId);
paramsConfigDataEO.setParamsConfigId(paramsConfigEOId);
ParamsConfigEO paramsConfigEO = this.paramsConfigEOService.queryById(paramsConfigEOId);
if(Objects.isNull(paramsConfigEO)){
continue;
}
if (CollectionUtil.isNotEmpty(paramsConfigDataVOList)) {
boolean appendFlag = false; // 拼接标识
for (Map<String, Object> paramsConfigDataVO : paramsConfigDataVOList) {
@@ -5397,7 +5400,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
// 配置数据重构后入库
List<ParamsCollectManifestEO> updateEOList = new ArrayList<>();
for (ParamsReportConfigDataEO paramsReportConfigDataEO : paramsReportConfigDataEOList) {
/*for (ParamsReportConfigDataEO paramsReportConfigDataEO : paramsReportConfigDataEOList) {
StringBuilder referencesColBuilder = new StringBuilder();
if (StringUtils.isNotEmpty(paramsReportConfigDataEO.getTextData())) {
referencesColBuilder.append(paramsReportConfigDataEO.getTextData()).append("#");
@@ -5429,6 +5432,55 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
}
}
}*/
for (ParamsCollectManifestEO paramsCollectManifestEO : paramsCollectManifestEOList) {
// 参考列值设置为空标识
boolean referencesColIsNullFlag = true;
for (ParamsReportConfigDataEO paramsReportConfigDataEO : paramsReportConfigDataEOList) {
if (StringUtils.equals(paramsCollectManifestEO.getNioNumber(),paramsReportConfigDataEO.getNioNumber())) {
// 控件类型相同 才能引用
if (paramsCollectManifestEO.getControlType().equals(paramsReportConfigDataEO.getControlType())) {
StringBuilder referencesColBuilder = new StringBuilder();
if (StringUtils.isNotEmpty(paramsReportConfigDataEO.getTextData())) {
referencesColBuilder.append(paramsReportConfigDataEO.getTextData()).append("#");
} else {
referencesColBuilder.append(" ").append("#");
}
if (StringUtils.isNotEmpty(paramsReportConfigDataEO.getPullData())) {
referencesColBuilder.append(paramsReportConfigDataEO.getPullData()).append("#");
} else {
referencesColBuilder.append(" ").append("#");
}
if (StringUtils.isNotEmpty(paramsReportConfigDataEO.getFileConnectId())) {
referencesColBuilder.append(paramsReportConfigDataEO.getFileConnectId()).append("#");
} else {
referencesColBuilder.append(" ").append("#");
}
String referencesCol = referencesColBuilder.toString();
ParamsCollectManifestEO updateCollectManifestEO = new ParamsCollectManifestEO();
updateCollectManifestEO.setId(paramsCollectManifestEO.getId());
updateCollectManifestEO.setReferencesCol(referencesCol);
updateEOList.add(updateCollectManifestEO);
referencesColIsNullFlag = false;
break;
}
}
}
if(referencesColIsNullFlag){
// 如果根据nio编号没有匹配到数据，将参考列的值设置为空
LambdaUpdateWrapper<ParamsCollectManifestEO> manifestUpdateWrap = new LambdaUpdateWrapper<>();
manifestUpdateWrap.eq(ParamsCollectManifestEO::getId,paramsCollectManifestEO.getId());
manifestUpdateWrap.set(ParamsCollectManifestEO::getReferencesCol,null);
this.update(manifestUpdateWrap);
}
}
// 修改参数清单的参考列名称