diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java index 3855adc43..9972741e6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java @@ -947,7 +947,7 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl> paramsConfigDataMap = paramsConfigDataEOList.stream().filter(configDataEO -> { + Map> paramsConfigDataMap = paramsConfigDataEOList.stream().filter(configDataEO -> { boolean flag = false; if (StringUtils.equals(configDataEO.getParamsCollectManifestId(), id)) { flag = true; @@ -957,7 +957,7 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl> paramsConfigDataCountList = new ArrayList<>(); - for (Map.Entry> map : paramsConfigDataMap.entrySet()) { + for (Map.Entry> map : paramsConfigDataMap.entrySet()) { Map paramsConfigDataCountMap = new HashMap<>(); paramsConfigDataCountMap.put("key", map.getKey()); paramsConfigDataCountMap.put("paramsConfigDataCount", map.getValue().size()); @@ -977,8 +977,8 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl paramsConfigDataMaxCountMap = paramsConfigDataCountList.get(0); String key = (String) paramsConfigDataMaxCountMap.get("key"); - List paramsConfigDataEOs = paramsConfigDataMap.get(key); - for (ParamsConfigDataEO paramsConfigDataEO : paramsConfigDataEOs) { + List paramsConfigDataEOs = paramsConfigDataMap.get(key); + for (ParamsConfigDataHistoryEO paramsConfigDataEO : paramsConfigDataEOs) { Map dataTemp = new HashMap<>(); data.entrySet().forEach(o -> dataTemp.put(o.getKey(), o.getValue())); exportDataList.add(dataTemp); @@ -1073,7 +1073,7 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl { // 参数配置 String paramsConfigId = paramsConfigEO.getId(); - List paramsConfigDataEOS = paramsConfigDataEOList.stream().filter(e -> { + List paramsConfigDataEOS = paramsConfigDataEOList.stream().filter(e -> { boolean flag = false; if(StringUtils.equals(paramsConfigId,e.getParamsConfigId()) && StringUtils.equals(paramsCollectManifestId,e.getParamsCollectManifestId())){ flag = true; @@ -1082,7 +1082,7 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.in(ParamsConfigDataEO::getParamsConfigId, configIdList); + queryWrapper.orderByAsc(ParamsConfigDataEO::getOrderNum); return list(queryWrapper); } return null; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataHistoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataHistoryEOServiceImpl.java index 7f4b19bcb..e5ab35711 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataHistoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataHistoryEOServiceImpl.java @@ -50,6 +50,7 @@ public class ParamsConfigDataHistoryEOServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.in(ParamsConfigDataHistoryEO::getParamsConfigId, configIdList); + queryWrapper.orderByAsc(ParamsConfigDataHistoryEO::getOrderNum); return list(queryWrapper); } return null; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java index 105c45a61..17b929011 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java @@ -66,6 +66,7 @@ public class ParamsReportConfigDataEOServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.in(ParamsReportConfigDataEO::getParamsConfigId, configIdList); + queryWrapper.orderByAsc(ParamsReportConfigDataEO::getOrderNum); return list(queryWrapper); } return null; diff --git a/jero-web/src/views/parameter/managementdetails/index.vue b/jero-web/src/views/parameter/managementdetails/index.vue index 1fa66204d..e04236ecc 100644 --- a/jero-web/src/views/parameter/managementdetails/index.vue +++ b/jero-web/src/views/parameter/managementdetails/index.vue @@ -950,7 +950,7 @@ import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header' ids:this.selectedRowKeys.join(','), ...this.formInline, 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' // downloadFile('/report/detail/exportGeneral', name, query, this.selectClear)