From a856b0db283f46b6b48086e371393d375eece1a3 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期四, 15 八月 2024 16:15:43 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 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 b85272a..ce8118e 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
@@ -1216,7 +1216,7 @@
}
}
- public SchemeComparDto SchemeCompar(String[] taskList) {
+ public SchemeComparDto SchemeCompar(String[] taskList, Long showProductId) {
SchemeComparDto dto = new SchemeComparDto();
List<SimulaDataDto> dataDtoList = new ArrayList<>();
List<SchemeComparCurve> curveList = new ArrayList<>();
@@ -1229,7 +1229,14 @@
Long taskModelId = Long.parseLong(taskId);
task = taskService.get(taskModelId);
simulatAssess = this.getByTaskId(taskModelId);
- SimulaDataDto resultData = this.getResultXML(simulatAssess);
+ SimulaDataDto resultData;
+ if (showProductId!=null){
+ simulatAssess.setShowProductId(showProductId);
+ resultData =this.getResultData(simulatAssess);
+ }else{
+ resultData = this.getResultXML(simulatAssess);
+ }
+
data = resultData;
data.setName(task.getTaskName());
dataDtoList.add(data);
--
Gitblit v1.9.1