From 87e7b5f463d9207104b36881dd5a3e6be0656a61 Mon Sep 17 00:00:00 2001
From: 林致杰 <1003392067@qq.com>
Date: 星期一, 28 二月 2022 17:26:15 +0800
Subject: [PATCH] MAQIAR部分修复
---
src/main/java/com/ots/project/tool/report/MAQNEW/MAQReport_V2.java | 12 +++++++-----
src/main/java/com/ots/common/utils/poi/WordUtil.java | 2 +-
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ots/common/utils/poi/WordUtil.java b/src/main/java/com/ots/common/utils/poi/WordUtil.java
index b859c5f..e679b53 100644
--- a/src/main/java/com/ots/common/utils/poi/WordUtil.java
+++ b/src/main/java/com/ots/common/utils/poi/WordUtil.java
@@ -961,7 +961,7 @@
}
if (StringUtils.equals(reportType, ReportTypeEnum.MAQ.getCode())) {
setMAQCompleteChars(textMap, charts);
- } else if (StringUtils.equals(reportType, ReportTypeEnum.MAQV2.getCode()) || StringUtils.equals(reportType, ReportTypeEnum.MAQIAR.getCode())) {
+ } else if (StringUtils.equals(reportType, ReportTypeEnum.MAQV2.getCode())) {
setMAQ_V2CompleteChars(textMap, charts);
} else if (StringUtils.equals(reportType, ReportTypeEnum.RuiLin.getCode())) {
setRuiLinChar(textMap, charts);
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 82f8149..7729ae6 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
@@ -56,11 +56,13 @@
SimpleMessage_V2 simpleMessage = new SimpleMessage_V2(p);
return simpleMessage;
}).collect(Collectors.toList()));
-
- paramList.add(new ResponseFidelityDiagnosisTitle_V2());
-
- paramList.add(new ResponseFidelityDiagnosis_V2());
-
+
+ //MAQ IAR涓嶉渶瑕�
+ if(!reportTypeEnum.getCode().equals(ReportTypeEnum.MAQIAR.getCode())){
+ paramList.add(new ResponseFidelityDiagnosisTitle_V2());
+ paramList.add(new ResponseFidelityDiagnosis_V2());
+ }
+
paramList.addAll(getScoreCharacteristicsList().stream().map(p -> {
ScoreCharacteristics_V2 scoreCharacteristics = new ScoreCharacteristics_V2(p);
return scoreCharacteristics;
--
Gitblit v1.9.1