From a86c2eb2db34d2d350e5c2eb72bf6416ec89c0d2 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期二, 19 十一月 2024 11:43:03 +0800
Subject: [PATCH] 1)可靠性评定时新增模型检查处理; 2)获取任务二项分布参数时,去掉模型的匹配。

---
 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/OperatConditModelService.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 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 1ac7413..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
@@ -15,6 +15,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 
 /**
@@ -34,9 +35,12 @@
      */
     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.getProductId());
-            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 TreeUtils2.build(list);
     }

--
Gitblit v1.9.1