From 6620dc7b245127616cb580700eb026da03e96de5 Mon Sep 17 00:00:00 2001
From: wzp <2040239371@qq.com>
Date: 星期一, 30 十二月 2024 17:06:48 +0800
Subject: [PATCH] fix:PAQ报告增加当前年度时间
---
src/main/java/com/ots/project/tool/exam/ExamUtil.java | 72 ++++++++++++++++++++++++++++++++++--
1 files changed, 68 insertions(+), 4 deletions(-)
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 51d0b80..cead00f 100644
--- a/src/main/java/com/ots/project/tool/exam/ExamUtil.java
+++ b/src/main/java/com/ots/project/tool/exam/ExamUtil.java
@@ -1,4 +1,5 @@
package com.ots.project.tool.exam;
+import com.ots.common.enums.ReportTypeEnum;
import com.ots.common.utils.StringUtils;
import java.util.Arrays;
import java.util.Date;
@@ -23,6 +24,7 @@
productTypeMap.put("RuiLin","RuiLin");
productTypeMap.put("MAQ", "MAQ");
productTypeMap.put("MAQV2", "MAQV2");
+ productTypeMap.put("MAQIAR", "MAQIAR");
productTypeMap.put("SAQ", "SAQ");
productTypeMap.put("JAQ", "JAQ");
}
@@ -111,9 +113,16 @@
barPictureMap.put("Combined_waterDrops", "CAQBar1.png");
barPictureMap.put("P_Abstract_context_waterDrops", "CAQBar1.png");
barPictureMap.put("P_Numeric_context_waterDrops", "CAQBar1.png");
+
+ //APIFan鐨勫浘鐗�
+ barPictureMap.put("box0","apifanSelected.png");
+ barPictureMap.put("box1","apifanDefault.png");
+
waterDropPictureMap.put("Combined_waterDrops", "waterDropOrange.png");
waterDropPictureMap.put("P_Abstract_context_waterDrops", "waterDropOrange.png");
waterDropPictureMap.put("P_Numeric_context_waterDrops", "waterDropOrange.png");
+
+
}
public static String scoreToVM(Integer score) {
if (score % 10 == 0) {
@@ -248,7 +257,13 @@
}
return JsonUtil.toJSONString(map);
}
-
+
+ /**
+ * 鑾峰彇鎻愮ず璇�
+ * @param langType 璇█
+ * @param contentMapJson 鎻愮ず璇唴瀹�
+ * @return
+ */
public static String getLangString(String langType, String contentMapJson) {
if (StringUtils.isEmpty(contentMapJson)) {
return "";
@@ -256,21 +271,59 @@
if (StringUtils.isEmpty(langType)) {
return contentMapJson;
}
+ /**
+ * json 杞负 map 鏂逛究鏍规嵁key鑾峰彇瀵瑰簲璇█鎻愮ず璇�
+ */
Map<String, String> contentMap = JsonUtil.parseObject(contentMapJson, HashMap.class);
if (Objects.isNull(contentMap)) {
return contentMapJson;
}
-
+
+ //瀵瑰簲璇█鎻愮ず璇负绌�
if (StringUtils.isNotEmpty(contentMap.get(langType))) {
return contentMap.get(langType);
- } else if (StringUtils.isNotEmpty(contentMap.get("English"))) {
+ } /*else if (StringUtils.isNotEmpty(contentMap.get("English"))) {
contentMap.get("English");
- }
+ }*/
if (contentMap.isEmpty()) {
return "";
}
return contentMap.values().stream().findFirst().get();
+ }
+
+ /**
+ * 鍒ゆ柇瀵瑰簲璇█鐨勬彁绀鸿鏄惁瀛樺湪
+ * @param langType 璇█
+ * @param contentMapJson 鎻愮ず璇唴瀹�
+ * @return
+ */
+ public static boolean isLangType(String langType, String contentMapJson) {
+ if (StringUtils.isEmpty(contentMapJson)) {
+ return false;
+ }
+ if (StringUtils.isEmpty(langType)) {
+ return false;
+ }
+ /**
+ * json 杞负 map 鏂逛究鏍规嵁key鑾峰彇瀵瑰簲璇█鎻愮ず璇�
+ */
+ Map<String, String> contentMap = JsonUtil.parseObject(contentMapJson, HashMap.class);
+ if (Objects.isNull(contentMap)) {
+ return false;
+ }
+
+ //瀵瑰簲璇█鎻愮ず璇负绌�
+ if (StringUtils.isNotEmpty(contentMap.get(langType))) {
+ return StringUtils.isNotEmpty(contentMap.get(langType));
+ } /*else if (StringUtils.isNotEmpty(contentMap.get("English"))) {
+ contentMap.get("English");
+ }*/
+ if (contentMap.isEmpty()) {
+ return false;
+ }
+
+ return false;
}
public static String getStringByLang(String langType, String contentMapJson) {
@@ -349,4 +402,15 @@
}
return "";
}
+
+ /**
+ * 鏄笉鏄疞AQ
+ * @return
+ */
+ public static boolean isLAQ(String testName){
+ if(StringUtils.isEmpty(testName)){
+ return false;
+ }
+ return testName.contains(ReportTypeEnum.LAQ.getCode());
+ }
}
--
Gitblit v1.9.1