From ce080c08f08c01695ddc9d9510b77eb6d2c7a38d Mon Sep 17 00:00:00 2001
From: 林致杰 <1003392067@qq.com>
Date: 星期五, 03 十二月 2021 11:13:48 +0800
Subject: [PATCH] MAQ-IAR改成MAQIAR
---
src/main/java/com/ots/common/utils/poi/WordUtil.java | 2 +-
src/main/java/com/ots/common/enums/ReportTypeEnum.java | 8 ++++----
src/main/java/com/ots/project/tool/exam/ExamUtil.java | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ots/common/enums/ReportTypeEnum.java b/src/main/java/com/ots/common/enums/ReportTypeEnum.java
index ae81631..da473a3 100644
--- a/src/main/java/com/ots/common/enums/ReportTypeEnum.java
+++ b/src/main/java/com/ots/common/enums/ReportTypeEnum.java
@@ -4,7 +4,7 @@
@Getter
public enum ReportTypeEnum {
Brief("Brief", "绠�鏄撶増"), Complete("Complete", "瀹屾暣鐗�"), SAQ("SAQ", "SAQ鎶ュ憡"), RuiLin("RuiLin", "鐫块偦鎶ュ憡"), CAQ("CAQ", "CAQ鎶ュ憡"),
- JAQ("JAQ","JAQ鎶ュ憡"),MAQ("MAQ", "MAQ鎶ュ憡"),MAQV2("MAQV2", "MAQV2鎶ュ憡"),PAQ("PAQ", "PAQ鎶ュ憡"),MAQ_IAR("MAQ-IAR", "MAQ-IAR鎶ュ憡");
+ JAQ("JAQ","JAQ鎶ュ憡"),MAQ("MAQ", "MAQ鎶ュ憡"),MAQV2("MAQV2", "MAQV2鎶ュ憡"),PAQ("PAQ", "PAQ鎶ュ憡"),MAQIAR("MAQIAR", "MAQIAR鎶ュ憡");
private final String code;
private final String message;
ReportTypeEnum(String code, String message) {
@@ -13,9 +13,9 @@
}
public static ReportTypeEnum codeOf(String code) {
for (ReportTypeEnum xxxEnum : values()) {
- //MAQ-IAR鐗规畩澶勭悊
- if (code.contains(MAQ_IAR.code)) {
- return MAQ_IAR;
+ //MAQIAR鐗规畩澶勭悊
+ if (code.contains(MAQIAR.code)) {
+ return MAQIAR;
}
if (Objects.equals(xxxEnum.getCode(), code)) {
return xxxEnum;
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 85c5913..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()) || StringUtils.equals(reportType, ReportTypeEnum.MAQ_IAR.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/exam/ExamUtil.java b/src/main/java/com/ots/project/tool/exam/ExamUtil.java
index ca623e6..8387d51 100644
--- a/src/main/java/com/ots/project/tool/exam/ExamUtil.java
+++ b/src/main/java/com/ots/project/tool/exam/ExamUtil.java
@@ -23,7 +23,7 @@
productTypeMap.put("RuiLin","RuiLin");
productTypeMap.put("MAQ", "MAQ");
productTypeMap.put("MAQV2", "MAQV2");
- productTypeMap.put("MAQ-IAR", "MAQ-IAR");
+ productTypeMap.put("MAQIAR", "MAQIAR");
productTypeMap.put("SAQ", "SAQ");
productTypeMap.put("JAQ", "JAQ");
}
--
Gitblit v1.9.1