From 132a8ccbae5b3283a855b14bdbe8ae99557050d1 Mon Sep 17 00:00:00 2001
From: 林致杰 <1003392067@qq.com>
Date: 星期一, 07 三月 2022 16:24:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/framework-v8-20220228' into framework-v8-20220228
---
src/main/java/com/ots/project/tool/report/MAQNEW/MAQReport_V2.java | 7 ++-----
src/main/java/com/ots/common/utils/poi/WordUtil.java | 2 +-
2 files changed, 3 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 e679b53..b859c5f 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())) {
+ } else if (StringUtils.equals(reportType, ReportTypeEnum.MAQV2.getCode()) || StringUtils.equals(reportType, ReportTypeEnum.MAQIAR.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 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