From d0e1a3fb24d0ee76aa4ef1b0e042392b4d3ac794 Mon Sep 17 00:00:00 2001 From: jinlin <jinlin> Date: 星期四, 07 十一月 2024 16:38:26 +0800 Subject: [PATCH] 预计参数多层次分级,新增型号增加namePath --- 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