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

修改UAT问题

Browse Source
This commit is contained in:
gaosong
2023-10-22 17:59:12 +08:00
parent accfb73cc6
commit 3ce2b0dc99
5 changed files with 10 additions and 7 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/ParamsCollectManifestHistoryEOServiceImpl.java
+6 -6
View File
@@ -947,7 +947,7 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl<Param
} }
String id = (String) data.get("id"); String id = (String) data.get("id");
Map<String, List<ParamsConfigDataEO>> paramsConfigDataMap = paramsConfigDataEOList.stream().filter(configDataEO -> { Map<String, List<ParamsConfigDataHistoryEO>> paramsConfigDataMap = paramsConfigDataEOList.stream().filter(configDataEO -> {
boolean flag = false; boolean flag = false;
if (StringUtils.equals(configDataEO.getParamsCollectManifestId(), id)) { if (StringUtils.equals(configDataEO.getParamsCollectManifestId(), id)) {
flag = true; flag = true;
@@ -957,7 +957,7 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl<Param
List<Map<String, Object>> paramsConfigDataCountList = new ArrayList<>(); List<Map<String, Object>> paramsConfigDataCountList = new ArrayList<>();
for (Map.Entry<String, List<ParamsConfigDataEO>> map : paramsConfigDataMap.entrySet()) { for (Map.Entry<String, List<ParamsConfigDataHistoryEO>> map : paramsConfigDataMap.entrySet()) {
Map<String, Object> paramsConfigDataCountMap = new HashMap<>(); Map<String, Object> paramsConfigDataCountMap = new HashMap<>();
paramsConfigDataCountMap.put("key", map.getKey()); paramsConfigDataCountMap.put("key", map.getKey());
paramsConfigDataCountMap.put("paramsConfigDataCount", map.getValue().size()); paramsConfigDataCountMap.put("paramsConfigDataCount", map.getValue().size());
@@ -977,8 +977,8 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl<Param
if (!paramsConfigDataCountList.isEmpty()) { if (!paramsConfigDataCountList.isEmpty()) {
Map<String, Object> paramsConfigDataMaxCountMap = paramsConfigDataCountList.get(0); Map<String, Object> paramsConfigDataMaxCountMap = paramsConfigDataCountList.get(0);
String key = (String) paramsConfigDataMaxCountMap.get("key"); String key = (String) paramsConfigDataMaxCountMap.get("key");
List<ParamsConfigDataEO> paramsConfigDataEOs = paramsConfigDataMap.get(key); List<ParamsConfigDataHistoryEO> paramsConfigDataEOs = paramsConfigDataMap.get(key);
for (ParamsConfigDataEO paramsConfigDataEO : paramsConfigDataEOs) { for (ParamsConfigDataHistoryEO paramsConfigDataEO : paramsConfigDataEOs) {
Map<String, Object> dataTemp = new HashMap<>(); Map<String, Object> dataTemp = new HashMap<>();
data.entrySet().forEach(o -> dataTemp.put(o.getKey(), o.getValue())); data.entrySet().forEach(o -> dataTemp.put(o.getKey(), o.getValue()));
exportDataList.add(dataTemp); exportDataList.add(dataTemp);
@@ -1073,7 +1073,7 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl<Param
paramsConfigEOList.forEach(paramsConfigEO -> { // 参数配置 paramsConfigEOList.forEach(paramsConfigEO -> { // 参数配置
String paramsConfigId = paramsConfigEO.getId(); String paramsConfigId = paramsConfigEO.getId();
List<ParamsConfigDataEO> paramsConfigDataEOS = paramsConfigDataEOList.stream().filter(e -> { List<ParamsConfigDataHistoryEO> paramsConfigDataEOS = paramsConfigDataEOList.stream().filter(e -> {
boolean flag = false; boolean flag = false;
if(StringUtils.equals(paramsConfigId,e.getParamsConfigId()) && StringUtils.equals(paramsCollectManifestId,e.getParamsCollectManifestId())){ if(StringUtils.equals(paramsConfigId,e.getParamsConfigId()) && StringUtils.equals(paramsCollectManifestId,e.getParamsCollectManifestId())){
flag = true; flag = true;
@@ -1082,7 +1082,7 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl<Param
}).collect(Collectors.toList()); // 参数配置数据 }).collect(Collectors.toList()); // 参数配置数据
StringBuilder configDataBuilder = new StringBuilder(); // 重新组合配置数据 StringBuilder configDataBuilder = new StringBuilder(); // 重新组合配置数据
if (CollectionUtil.isNotEmpty(paramsConfigDataEOS)) { if (CollectionUtil.isNotEmpty(paramsConfigDataEOS)) {
ParamsConfigDataEO paramsConfigDataEO = paramsConfigDataEOS.get(0); ParamsConfigDataHistoryEO paramsConfigDataEO = paramsConfigDataEOS.get(0);
if (StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) { if (StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) {
configDataBuilder.append(paramsConfigDataEO.getTextData()).append("#"); configDataBuilder.append(paramsConfigDataEO.getTextData()).append("#");
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataEOServiceImpl.java
+1
View File
@@ -133,6 +133,7 @@ public class ParamsConfigDataEOServiceImpl extends ServiceImpl<ParamsConfigDataE
if (CollectionUtil.isNotEmpty(configIdList)) { if (CollectionUtil.isNotEmpty(configIdList)) {
LambdaQueryWrapper<ParamsConfigDataEO> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<ParamsConfigDataEO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(ParamsConfigDataEO::getParamsConfigId, configIdList); queryWrapper.in(ParamsConfigDataEO::getParamsConfigId, configIdList);
queryWrapper.orderByAsc(ParamsConfigDataEO::getOrderNum);
return list(queryWrapper); return list(queryWrapper);
} }
return null; return null;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataHistoryEOServiceImpl.java
+1
View File
@@ -50,6 +50,7 @@ public class ParamsConfigDataHistoryEOServiceImpl extends ServiceImpl<ParamsConf
if (CollectionUtil.isNotEmpty(configIdList)) { if (CollectionUtil.isNotEmpty(configIdList)) {
LambdaQueryWrapper<ParamsConfigDataHistoryEO> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<ParamsConfigDataHistoryEO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(ParamsConfigDataHistoryEO::getParamsConfigId, configIdList); queryWrapper.in(ParamsConfigDataHistoryEO::getParamsConfigId, configIdList);
queryWrapper.orderByAsc(ParamsConfigDataHistoryEO::getOrderNum);
return list(queryWrapper); return list(queryWrapper);
} }
return null; return null;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java
+1
View File
@@ -66,6 +66,7 @@ public class ParamsReportConfigDataEOServiceImpl extends ServiceImpl<ParamsRepor
if (CollectionUtil.isNotEmpty(configIdList)) { if (CollectionUtil.isNotEmpty(configIdList)) {
LambdaQueryWrapper<ParamsReportConfigDataEO> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<ParamsReportConfigDataEO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(ParamsReportConfigDataEO::getParamsConfigId, configIdList); queryWrapper.in(ParamsReportConfigDataEO::getParamsConfigId, configIdList);
queryWrapper.orderByAsc(ParamsReportConfigDataEO::getOrderNum);
return list(queryWrapper); return list(queryWrapper);
} }
return null; return null;
jero-web/src/views/parameter/managementdetails/index.vue
+1 -1
View File
@@ -950,7 +950,7 @@ import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
ids:this.selectedRowKeys.join(','), ids:this.selectedRowKeys.join(','),
...this.formInline, ...this.formInline,
exportOption: this.dataExportformInline.exportOption, exportOption: this.dataExportformInline.exportOption,
exportName: this.$route.query.projectName + '(' + this.$route.query.title + this.$route.query.version + ')' exportName: this.$route.query.projectName + '(' + this.$route.query.title + ')' +'-'+ this.$route.query.version,
} }
// let name = this.$route.query.projectName + '(' + this.$route.query.title + ')' + '.zip' // let name = this.$route.query.projectName + '(' + this.$route.query.title + ')' + '.zip'
// downloadFile('/report/detail/exportGeneral', name, query, this.selectClear) // downloadFile('/report/detail/exportGeneral', name, query, this.selectClear)