From 1b95f852d2aed044cc28e72f23fecb4da1994e0c Mon Sep 17 00:00:00 2001
From: linzhijie <1003392067@qq.com>
Date: 星期二, 20 九月 2022 16:04:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/framework-v10-20220422' into framework-v11-20220919
---
src/main/java/com/ots/project/tool/report/MAQNEW/MAQReport_V2.java | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ots/project/tool/report/MAQNEW/MAQReport_V2.java b/src/main/java/com/ots/project/tool/report/MAQNEW/MAQReport_V2.java
index e94d7f3..8c0f1d6 100644
--- a/src/main/java/com/ots/project/tool/report/MAQNEW/MAQReport_V2.java
+++ b/src/main/java/com/ots/project/tool/report/MAQNEW/MAQReport_V2.java
@@ -57,11 +57,8 @@
return simpleMessage;
}).collect(Collectors.toList()));
- //MAQ IAR涓嶉渶瑕�
- if(!reportTypeEnum.getCode().equals(ReportTypeEnum.MAQIAR.getCode())){
- paramList.add(new ResponseFidelityDiagnosisTitle_V2());
- paramList.add(new ResponseFidelityDiagnosis_V2());
- }
+ paramList.add(new ResponseFidelityDiagnosisTitle_V2());
+ paramList.add(new ResponseFidelityDiagnosis_V2());
paramList.addAll(getScoreCharacteristicsList().stream().map(p -> {
ScoreCharacteristics_V2 scoreCharacteristics = new ScoreCharacteristics_V2(p);
--
Gitblit v1.9.1