From 12e38a9c58fa02cc42104793609ac4e240bc6184 Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期四, 07 十一月 2024 16:46:29 +0800
Subject: [PATCH] 工况管理
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/OperatConditModelService.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/OperatConditModelService.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/OperatConditModelService.java
index 06eda77..3fcb932 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/OperatConditModelService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/OperatConditModelService.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.zt.common.service.BaseService;
import com.zt.common.utils.TreeUtils;
+import com.zt.common.utils.TreeUtils2;
import com.zt.life.modules.mainPart.taskReliability.dao.OperatConditModelDao;
import com.zt.life.modules.mainPart.taskReliability.model.ModelNodes;
import com.zt.life.modules.mainPart.taskReliability.model.ModelRbd;
@@ -14,6 +15,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
/**
@@ -33,11 +35,14 @@
*/
public List<OperatConditModel> page(QueryFilter queryFilter) {
List<OperatConditModel> list = baseDao.getList(queryFilter.getQueryParams());
+ List<ModelRbd> modelList = baseDao.getModelList(queryFilter.getQueryParams());
for (OperatConditModel conditModel : list) {
- List<ModelRbd> modelList = baseDao.getModelList(conditModel.getId());
- conditModel.setModelList(modelList);
+ //List<ModelRbd> modelList = baseDao.getModelList(conditModel.getProductId());
+ List<ModelRbd> myList = modelList.stream().filter(item ->
+ item.getProductId().equals(conditModel.getProductId())).collect(Collectors.toList());
+ conditModel.setModelList(myList);
}
- return TreeUtils.build(list);
+ return TreeUtils2.build(list);
}
--
Gitblit v1.9.1