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

Merge remote-tracking branch 'origin/fix_20230609' into fix_20230609

Browse Source
This commit is contained in:
高嵩
2023-06-15 18:12:46 +08:00
parent bfc843c802 43cc2a0689
commit e7ae803cee
1 changed files with 12 additions and 13 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/report/service/impl/ParamsReportDetailEOServiceImpl.java
+7 -8
View File
@@ -1398,13 +1398,14 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
} }
String configData = configDataBuilderTemp.toString(); String configData = configDataBuilderTemp.toString();
if(StringUtils.isNotEmpty(configData)){
if (configData.contains("#")) { if (configData.contains("#")) {
configData = configData.substring(0, configData.lastIndexOf("#")); configData = configData.substring(0, configData.lastIndexOf("#"));
} }
configDataBuilder.append(configData).append(paramsReportDetailVO.getSeparator()); configDataBuilder.append(configData).append(paramsReportDetailVO.getSeparator());
} }
} }
}
String configData = configDataBuilder.toString(); String configData = configDataBuilder.toString();
@@ -1423,7 +1424,7 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
} else { } else {
List<ParamsReportConfigDataEO> paramsReportConfigDataEOS = paramsReportConfigDataEOService.queryByConfigIdListAndCollectManifestId(configIdList, paramsCollectManifestId); List<ParamsReportConfigDataEO> paramsReportConfigDataEOS = paramsReportConfigDataEOService.queryByConfigIdListAndCollectManifestId(configIdList, paramsCollectManifestId);
StringBuilder configDataBuilder = new StringBuilder(); // 重新组合配置数据 List<String> configDataList = new ArrayList<>(); // 重新组合配置数据
for (ParamsReportConfigDataEO paramsConfigDataEO : paramsReportConfigDataEOS) { for (ParamsReportConfigDataEO paramsConfigDataEO : paramsReportConfigDataEOS) {
StringBuilder configDataBuilderTemp = new StringBuilder(); // 重新组合配置数据 StringBuilder configDataBuilderTemp = new StringBuilder(); // 重新组合配置数据
@@ -1458,17 +1459,15 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
} }
configData = configDataBuilderTemp.toString(); configData = configDataBuilderTemp.toString();
if(StringUtils.isNotEmpty(configData)){
if (configData.contains("#")) { if (configData.contains("#")) {
configData = configData.substring(0, configData.lastIndexOf("#")); configData = configData.substring(0, configData.lastIndexOf("#"));
} }
configDataList.add(configData);
configDataBuilder.append(configData).append(paramsReportDetailVO.getSeparator()); }
} }
String configDataStr = configDataBuilder.toString(); String configDataStr = configDataList.stream().distinct().collect(Collectors.joining(paramsReportDetailVO.getSeparator()));
if (configDataStr.contains(paramsReportDetailVO.getSeparator())) {
configDataStr = configDataStr.substring(0, configDataStr.lastIndexOf(paramsReportDetailVO.getSeparator()));
}
record1.put("params_value", configDataStr); record1.put("params_value", configDataStr);
} }