From 17ce02ec6fefa4e8b9ac870e2b52dea0942f5597 Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期四, 05 十二月 2024 09:40:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java | 9 ++++++---
1 files changed, 6 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 0925f14..7ab70ec 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
@@ -885,7 +885,8 @@
for (TaskPhaseModel taskPhaseModel : taskPhaseModelAll) {
Element taskTag = tasksTag.addElement("task");
taskTag.addAttribute("duration", String.valueOf(taskPhaseModel.getOperatConditDuration()));
- taskTag.addAttribute("model", taskPhaseModel.getOperatConditId().toString());
+// taskTag.addAttribute("model", taskPhaseModel.getOperatConditId().toString());
+ taskTag.addAttribute("model", taskPhaseModel.getId().toString());
if (null != taskPhaseModel.getPhaseConstraints() && taskPhaseModel.getPhaseConstraints().size() > 0) {
taskTag.addAttribute("NAM",
taskPhaseModel.getPhaseConstraints().stream().map(item ->
@@ -1011,7 +1012,8 @@
Element modelsTag = root.addElement("models");
for (TaskPhaseModel taskPhaseModel : taskPhaseModelAll) {
Element modelTag = modelsTag.addElement("model");
- modelTag.addAttribute("name", taskPhaseModel.getOperatConditId().toString());
+// modelTag.addAttribute("name", taskPhaseModel.getOperatConditId().toString());
+ modelTag.addAttribute("name", taskPhaseModel.getId().toString());
List<OperatConditModel> gkModelsAssembled = operatConditModelDao.getGKModelAssembled(
taskPhaseModel.getOperatConditId());
OperatConditModel gkModelTop = gkModelsAssembled.stream().filter(item ->
@@ -1100,7 +1102,8 @@
ParamData paramData = paramDataList.stream().filter(item ->
dataId.equals(item.getProductId())).collect(Collectors.toList()).get(0);
Double ratio = paramData.getTaskMtbcfOperatingRatio();
- if (null != ratio && ratio > 0) {
+// if (null != ratio && ratio > 0) {
+ if (null != ratio && ratio != 1.0) {
// 闂存柇鍨嬭澶囩殑澶勭悊
double cycon = taskPhaseModel.getOperatConditDuration() * ratio;
double cycdown = taskPhaseModel.getOperatConditDuration() - cycon;
--
Gitblit v1.9.1