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/SimulatAssessService.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java
index 93e99b1..ec03e1b 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java
@@ -1086,8 +1086,8 @@
                 // 璁惧
                 Integer deviceNo = node.getDeviceNo();
                 Element nodeTag = parent.addElement("node");
-                nodeTag.addAttribute("name", deviceNo == 0 ? dataId.toString() : dataId.toString() + "-" + deviceNo);
-                nodeTag.addAttribute("real_name", deviceNo == 0 ? product.getName() : product.getName() + "-" + deviceNo);
+                nodeTag.addAttribute("name", dataId.toString() + "-" + deviceNo);
+                nodeTag.addAttribute("real_name", product.getName() + "-" + deviceNo);
                 nodeTag.addAttribute("name_path", product.getNamePath());
                 nodeTag.addAttribute("type", "node");
 
@@ -1108,7 +1108,7 @@
                             .filter(item -> taskId.equals(item.getTaskId()))
                             .filter(item -> taskPhaseModel.getPhaseId().equals(item.getPhaseId()))
                             .filter(item -> taskPhaseModel.getOperatConditId().equals(item.getOperatConditId()))
-                            .filter(item -> modelId.equals(item.getModelId()))
+//                            .filter(item -> modelId.equals(item.getModelId()))
                             .filter(item -> dataId.equals(item.getProductId()))
                             .collect(Collectors.toList()).get(0);
                 }

--
Gitblit v1.9.1