From 9025b9cf7ec8610003d445a31d93e35e7bd73c2e Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 31 一月 2024 17:54:52 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/ConfigItemWarehouseService.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/ConfigItemWarehouseService.java b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/ConfigItemWarehouseService.java
index 89f9c5e..b5a186d 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/ConfigItemWarehouseService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/ConfigItemWarehouseService.java
@@ -222,7 +222,7 @@
data.setCmAuditList((List<WarehouseCmAudit>) cmList);
List<?> qaList = this.itemQaList("warehouse_qa_audit");
data.setQaAuditList((List<WarehouseQaAudit>) qaList);
- List<?> resultList = new ArrayList<>();
+ List<WarehouseConfigItem> resultList = new ArrayList<>();
if ("1".equals(libraryType)) {
List<String> srcId = technicalService.getsrcId(projectId);
/* String ids = String.join(", ", srcId.stream()
@@ -230,9 +230,15 @@
.collect(Collectors.toList()));*/
String ids = String.join(", ", srcId);
resultList = configItemService.ConfigItemList(projectId, ids);
+ for (WarehouseConfigItem item :resultList){
+ if (ids.contains(item.getSrcId().toString()) && item.getSrcId()!=null && StringUtils.isNotBlank(ids)){
+ WarehouseConfigItem item2 = configItemService.getBySrc(projectId,item.getSrcId());
+ item.setVersion(null);
+ item.setRetrospectVersion(item2.getVersion());
+ }
+ }
}
- List<?> ConfigItemList = resultList;
- data.setConfigItemList((List<WarehouseConfigItem>) ConfigItemList);
+ data.setConfigItemList(resultList);
}
if (projectId != null) {
--
Gitblit v1.9.1