From c63c907840e9c194d92ad490efd5f76c7f67a900 Mon Sep 17 00:00:00 2001
From: 林致杰 <1003392067@qq.com>
Date: 星期一, 07 三月 2022 16:24:11 +0800
Subject: [PATCH] MAQ泰文版修复
---
src/main/java/com/ots/project/tool/report/MAQNEW/MAQReport_V2.java | 88 +++++++++++++++++++++++++++++--------------
1 files changed, 59 insertions(+), 29 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 d546a29..e94d7f3 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
@@ -34,9 +34,21 @@
private Map otherParams;
private LangTypeEnum langType;
+
+ /**
+ * 鏍规嵁鎶ュ憡绫诲瀷鍒濆鍖栨暟鎹�
+ * @param reportTypeEnum
+ * @return
+ */
public List<BaseCondition_V2> getParamList(ReportTypeEnum reportTypeEnum) {
return init(reportTypeEnum);
}
+
+ /**
+ * 鏍规嵁鎶ュ憡绫诲瀷鍒濆鍖栨墍鏈�
+ * @param reportTypeEnum
+ * @return
+ */
private List<BaseCondition_V2> init(ReportTypeEnum reportTypeEnum) {
List<BaseCondition_V2> paramList = new ArrayList<>();
@@ -44,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;
@@ -85,6 +99,7 @@
private List<String> getSimpleMessageCoreIds() {
return Arrays.asList(
"LIBMAQV20001", "LIBMAQV20002", "LIBMAQV20003", "LIBMAQV20004", "LIBMAQV20005",
+ "LIBMAQV200101","LIBMAQV200201","LIBMAQV200301","LIBMAQV20041","LIBMAQV20042",//MAQV2绠�鏄撶増鎶ュ憡闇�瑕佺敤鍒�
"LIBMAQV200071", "LIBMAQV20006", "LIBMAQV20009", "LIBMAQV20210", "LIBMAQV200077",
"LIBMAQV20008", "LIBMAQV20009", "LIBMAQV20010", "LIBMAQV20011", "LIBMAQV20030",
"LIBMAQV20040", "LIBMAQV20060", "LIBMAQV233000", "LIBMAQV20008", "LIBMAQV20065",
@@ -129,32 +144,32 @@
private List<MAQSummaryCondition_V2> getMAQSummaryParamList(String summaryType) {
List<MAQSummaryCondition_V2> paramList = new ArrayList<>();
if (Objects.equals(OPENNESSTOEXPERIENCE_1, summaryType)) {
- paramList.add(new MAQSummaryCondition_V2(new MAQConditionVO_V2(OPENNESSTOEXPERIENCE_1, "Flexibility,鐏垫椿鎬�", "P_Flex01", "LIBMAQV210")));
- paramList.add(new MAQSummaryCondition_V2(new MAQConditionVO_V2(OPENNESSTOEXPERIENCE_1, "Creativity,鍒涢�犳��", "P_Creat02", "LIBMAQV220")));
- paramList.add(new MAQSummaryCondition_V2(new MAQConditionVO_V2(OPENNESSTOEXPERIENCE_1, "Analytical Approach,鍒嗘瀽瀵煎悜", "P_Analyt03", "LIBMAQV230")));
- paramList.add(new MAQSummaryCondition_V2(new MAQConditionVO_V2(OPENNESSTOEXPERIENCE_1, "Independence,鑷富鐙珛", "P_Indep04", "LIBMAQV240")));
+ paramList.add(new MAQSummaryCondition_V2(new MAQConditionVO_V2(OPENNESSTOEXPERIENCE_1, "Flexibility,鐏垫椿鎬�,喔勦抚喔侧浮喔⑧阜喔斷斧喔⑧父喙堗笝", "P_Flex01", "LIBMAQV210")));
+ paramList.add(new MAQSummaryCondition_V2(new MAQConditionVO_V2(OPENNESSTOEXPERIENCE_1, "Creativity,鍒涢�犳��,喔勦抚喔侧浮喔勦复喔斷釜喔｀箟喔侧竾喔福喔｀竸喙�", "P_Creat02", "LIBMAQV220")));
+ paramList.add(new MAQSummaryCondition_V2(new MAQConditionVO_V2(OPENNESSTOEXPERIENCE_1, "Analytical Approach,鍒嗘瀽瀵煎悜,喔о复喔樴傅喔佮覆喔｀抚喔脆箑喔勦福喔侧赴喔箤", "P_Analyt03", "LIBMAQV230")));
+ paramList.add(new MAQSummaryCondition_V2(new MAQConditionVO_V2(OPENNESSTOEXPERIENCE_1, "Independence,鑷富鐙珛,喔勦抚喔侧浮喙�喔涏箛喔權腑喔脆釜喔｀赴", "P_Indep04", "LIBMAQV240")));
} else if (Objects.equals(CONSCIENTIOUS_2, summaryType)) {
- paramList.add(new MAQSummaryCondition_V2(new MAQConditionVO_V2(CONSCIENTIOUS_2, "Achievement Orientation,鎴愬氨瀵煎悜", "P_Achiev05", "LIBMAQV250")));
- paramList.add(new MAQSummaryCondition_V2(new MAQConditionVO_V2(CONSCIENTIOUS_2, "Initiative,鑳藉姩鎬�", "P_Initi06", "LIBMAQV260")));
- paramList.add(new MAQSummaryCondition_V2(new MAQConditionVO_V2(CONSCIENTIOUS_2, "Persistence,鍧氭寔鎬�", "P_Persis07", "LIBMAQV270")));
- paramList.add(new MAQSummaryCondition_V2(new MAQConditionVO_V2(CONSCIENTIOUS_2, "Thoroughness,缁嗚嚧鎬�", "P_Thorou08", "LIBMAQV280")));
- paramList.add(new MAQSummaryCondition_V2(new MAQConditionVO_V2(CONSCIENTIOUS_2, "Dependability,鍙潬鎬�", "P_Depend09", "LIBMAQV290")));
- paramList.add(new MAQSummaryCondition_V2(new MAQConditionVO_V2(CONSCIENTIOUS_2, "Planning and Organizing,璁″垝/缁勭粐鎬�", "P_Plan10", "LIBMAQV2100")));
- paramList.add(new MAQSummaryCondition_V2(new MAQConditionVO_V2(CONSCIENTIOUS_2, "Trust and Integrity,鍧﹁瘹瀹堣", "P_Integr11", "LIBMAQV2110")));
+ paramList.add(new MAQSummaryCondition_V2(new MAQConditionVO_V2(CONSCIENTIOUS_2, "Achievement Orientation,鎴愬氨瀵煎悜,喔佮赋喔笝喔斷箑喔涏箟喔侧斧喔∴覆喔⑧箖喔箟喔溹弗喔副喔∴袱喔椸笜喔脆箤", "P_Achiev05", "LIBMAQV250")));
+ paramList.add(new MAQSummaryCondition_V2(new MAQConditionVO_V2(CONSCIENTIOUS_2, "Initiative,鑳藉姩鎬�,喔勦抚喔侧浮喔勦复喔斷福喔脆箑喔｀复喙堗浮", "P_Initi06", "LIBMAQV260")));
+ paramList.add(new MAQSummaryCondition_V2(new MAQConditionVO_V2(CONSCIENTIOUS_2, "Persistence,鍧氭寔鎬�,喔о复喔｀复喔⑧赴", "P_Persis07", "LIBMAQV270")));
+ paramList.add(new MAQSummaryCondition_V2(new MAQConditionVO_V2(CONSCIENTIOUS_2, "Thoroughness,缁嗚嚧鎬�,喔勦抚喔侧浮喔ム赴喙�喔傅喔⑧笖喔｀腑喔氞竸喔笟", "P_Thorou08", "LIBMAQV280")));
+ paramList.add(new MAQSummaryCondition_V2(new MAQConditionVO_V2(CONSCIENTIOUS_2, "Dependability,鍙潬鎬�,喔勦抚喔侧浮喔權箞喔侧箑喔娻阜喙堗腑喔栢阜喔�", "P_Depend09", "LIBMAQV290")));
+ paramList.add(new MAQSummaryCondition_V2(new MAQConditionVO_V2(CONSCIENTIOUS_2, "Planning and Organizing,璁″垝/缁勭粐鎬�,喔佮覆喔｀抚喔侧竾喙佮笢喔權箒喔ム赴喔佮覆喔｀笀喔编笖喔｀赴喙�喔氞傅喔⑧笟", "P_Plan10", "LIBMAQV2100")));
+ paramList.add(new MAQSummaryCondition_V2(new MAQConditionVO_V2(CONSCIENTIOUS_2, "Trust and Integrity,鍧﹁瘹瀹堣,喔勦抚喔侧浮喔權箞喔侧箑喔娻阜喙堗腑喔栢阜喔箒喔ム赴喔勦抚喔侧浮喔嬥阜喙堗腑喔副喔曕涪喙�", "P_Integr11", "LIBMAQV2110")));
} else if (Objects.equals(SOCIALLYOPEN_3, summaryType)) {
- paramList.add(new MAQSummaryCondition_V2(new MAQConditionVO_V2(SOCIALLYOPEN_3, "Personal Energy,涓汉绮惧姏", "P_Energy12", "LIBMAQV2120")));
- paramList.add(new MAQSummaryCondition_V2(new MAQConditionVO_V2(SOCIALLYOPEN_3, "Socially Open,绀句氦涓诲姩鎬�", "P_Social13", "LIBMAQV2130")));
- paramList.add(new MAQSummaryCondition_V2(new MAQConditionVO_V2(SOCIALLYOPEN_3, "Leading Others,鏀厤鎬�", "P_Lead14", "LIBMAQV2140")));
- paramList.add(new MAQSummaryCondition_V2(new MAQConditionVO_V2(SOCIALLYOPEN_3, "Influence ,褰卞搷鍔�", "P_Influ15", "LIBMAQV2150")));
+ paramList.add(new MAQSummaryCondition_V2(new MAQConditionVO_V2(SOCIALLYOPEN_3, "Personal Energy,涓汉绮惧姏,喔炧弗喔编竾喔囙覆喔權釜喙堗抚喔權笗喔编抚", "P_Energy12", "LIBMAQV2120")));
+ paramList.add(new MAQSummaryCondition_V2(new MAQConditionVO_V2(SOCIALLYOPEN_3, "Socially Open,绀句氦涓诲姩鎬�,喔勦抚喔侧浮喙�喔涏箛喔權笢喔灌箟喙�喔涏复喔斷竵喔о箟喔侧竾", "P_Social13", "LIBMAQV2130")));
+ paramList.add(new MAQSummaryCondition_V2(new MAQConditionVO_V2(SOCIALLYOPEN_3, "Leading Others,鏀厤鎬�,喔佮覆喔｀笝喔赤笢喔灌箟喔阜喙堗笝", "P_Lead14", "LIBMAQV2140")));
+ paramList.add(new MAQSummaryCondition_V2(new MAQConditionVO_V2(SOCIALLYOPEN_3, "Influence ,褰卞搷鍔�,喔佮覆喔｀笀喔灌竾喙冟笀喔溹腹喙夃腑喔粪箞喔�", "P_Influ15", "LIBMAQV2150")));
} else if (Objects.equals(AGREEABLENESS_4, summaryType)) {
- paramList.add(new MAQSummaryCondition_V2(new MAQConditionVO_V2(AGREEABLENESS_4, "Cooperation & Teamwork,鍥㈤槦鍚堜綔", "P_Team16", "LIBMAQV2160")));
- paramList.add(new MAQSummaryCondition_V2(new MAQConditionVO_V2(AGREEABLENESS_4, "Empathetic,鍚岀悊蹇�", "P_Empath17", "LIBMAQV2170")));
- paramList.add(new MAQSummaryCondition_V2(new MAQConditionVO_V2(AGREEABLENESS_4, "Polite & Tactful,绀句氦鏁忔劅鎬�", "P_Polite18", "LIBMAQV2180")));
+ paramList.add(new MAQSummaryCondition_V2(new MAQConditionVO_V2(AGREEABLENESS_4, "Cooperation & Teamwork,鍥㈤槦鍚堜綔,喔勦抚喔侧浮喔｀箞喔о浮喔∴阜喔箒喔ム赴喔佮覆喔｀笚喔赤竾喔侧笝喙�喔涏箛喔權笚喔掂浮", "P_Team16", "LIBMAQV2160")));
+ paramList.add(new MAQSummaryCondition_V2(new MAQConditionVO_V2(AGREEABLENESS_4, "Empathetic,鍚岀悊蹇�,喔勦抚喔侧浮喙�喔箛喔權腑喔佮箑喔箛喔權箖喔�", "P_Empath17", "LIBMAQV2170")));
+ paramList.add(new MAQSummaryCondition_V2(new MAQConditionVO_V2(AGREEABLENESS_4, "Polite & Tactful,绀句氦鏁忔劅鎬�,喔勦抚喔侧浮喔父喔犩覆喔炧箒喔ム赴喔∴傅喙勦斧喔о笧喔｀复喔�", "P_Polite18", "LIBMAQV2180")));
} else if (Objects.equals(EMOTIONALBALANCE_5, summaryType)) {
- paramList.add(new MAQSummaryCondition_V2(new MAQConditionVO_V2(EMOTIONALBALANCE_5, "Self-Regulation,鑷帶鍔�", "P_Regula19", "LIBMAQV2190")));
- paramList.add(new MAQSummaryCondition_V2(new MAQConditionVO_V2(EMOTIONALBALANCE_5, "Managing Stress,鍘嬪姏绠＄悊", "P_ManStr20", "LIBMAQV2200")));
- paramList.add(new MAQSummaryCondition_V2(new MAQConditionVO_V2(EMOTIONALBALANCE_5, "Self-Confidence,鑷俊/寮规��", "P_Confid21", "LIBMAQV2210")));
- paramList.add(new MAQSummaryCondition_V2(new MAQConditionVO_V2(EMOTIONALBALANCE_5, "Mindfulness,涓撴敞/瑙夊療", "P_Mind22", "LIBMAQV2220")));
+ paramList.add(new MAQSummaryCondition_V2(new MAQConditionVO_V2(EMOTIONALBALANCE_5, "Self-Regulation,鑷帶鍔�,喔佮覆喔｀竸喔о笟喔勦父喔∴笗喔權箑喔竾", "P_Regula19", "LIBMAQV2190")));
+ paramList.add(new MAQSummaryCondition_V2(new MAQConditionVO_V2(EMOTIONALBALANCE_5, "Managing Stress,鍘嬪姏绠＄悊,喔佮覆喔｀笀喔编笖喔佮覆喔｀竵喔编笟喔勦抚喔侧浮喙�喔勦福喔掂涪喔�", "P_ManStr20", "LIBMAQV2200")));
+ paramList.add(new MAQSummaryCondition_V2(new MAQConditionVO_V2(EMOTIONALBALANCE_5, "Self-Confidence,鑷俊/寮规��,喔勦抚喔侧浮喔∴副喙堗笝喙冟笀喙冟笝喔曕笝喙�喔竾", "P_Confid21", "LIBMAQV2210")));
+ paramList.add(new MAQSummaryCondition_V2(new MAQConditionVO_V2(EMOTIONALBALANCE_5, "Mindfulness,涓撴敞/瑙夊療,喙佮弗喔班釜喔｀箟喔侧竾喙佮福喔囙笟喔编笝喔斷覆喔ム箖喔堗箖喔箟喔溹腹喙夃浮喔掂釜喙堗抚喔權箘喔斷箟喔箞喔о笝喙�喔傅喔⑧競喔竾喔竾喔勦箤喔佮福喙�喔娻阜喙堗腑喔∴副喙堗笝喙冟笝喔炧副喔權笜喔佮复喔�,喔о复喔副喔⑧笚喔编辅喔權箤 喙佮弗喔班竸喙堗覆喔權复喔⑧浮喔傕腑喔囙腑喔囙竸喙屶竵喔�", "P_Mind22", "LIBMAQV2220")));
}
return paramList;
}
@@ -186,13 +201,21 @@
conditionVOList.add(new MAQConditionVO_V2("People_Orientation_32", "P_People32", "LIBMAQV2320"));
return conditionVOList;
}
-
+
+ /**
+ * 鑾峰彇鎶ュ憡瀛楀吀鏇挎崲鍊�
+ * @param thaiCalculationMap
+ * @param type
+ * @param langType
+ * @return
+ */
public ReportResultData getTemplateParameters(Map<String, String> thaiCalculationMap, ReportTypeEnum type, LangTypeEnum langType) {
this.reportTypeEnum = type;
this.langType = langType;
Map textMap = new HashMap();
Map waterDropsMap = new HashMap();
+ //鍩烘湰淇℃伅瀛楁
textMap.put("questionnaireTaker", getQuestionnaireTaker());
textMap.put("questionnaireID", getQuestionnaireID());
textMap.put("reportGenerationDate", getReportGenerationDate());
@@ -200,18 +223,25 @@
textMap.put("questionnaireEmail", getQuestionnaireEmail());
textMap.put("questionnaireStartTime", getQuestionnaireStartTime());
textMap.put("questionnaireEndTime", getQuestionnaireEndTime());
-
+ //鏍规嵁鎶ュ憡绫诲瀷鑾峰彇鎶ュ憡瀛楀吀
getParamList(type).stream().forEach(p -> {
+ //鑾峰彇瀵瑰簲璇█鎶ュ憡瀛楀吀
TLibraryCode calculate = p.calculate(thaiCalculationMap, langType);
List<TLibraryCode> tLibraryCodes = p.calculateList(thaiCalculationMap, langType);
if(tLibraryCodes != null && tLibraryCodes.size() > 0){
+ //琛ㄦ牸澶氫綅 璁＄畻鍒嗘暟鍊艰祴鍊� 渚嬪
+ // 琛ㄦ牸鐨勶細%ResponseFidelityDiagnosis_V2_0%
+ // 琛ㄦ牸鐨勶細%ResponseFidelityDiagnosis_V2_1%
+ // 琛ㄦ牸鐨勶細%ResponseFidelityDiagnosis_V2_2%
for (int i = 0; i < tLibraryCodes.size(); i++) {
TLibraryCode tLibraryCode = tLibraryCodes.get(i);
textMap.put(p.getName() + "_" + i, Objects.isNull(tLibraryCode) || StringUtils.isBlank(tLibraryCode.getLangTypeContext(langType)) ? "N/A NONE" : tLibraryCode.getLangTypeContext(langType));
}
}else{
+ //鏅�氭姤鍛婂瓧鍏歌祴鍊�
textMap.put(p.getName(), Objects.isNull(calculate) || StringUtils.isBlank(calculate.getLangTypeContext(langType)) ? "N/A NONE" : calculate.getLangTypeContext(langType));
}
+ //姘存淮闆嗗悎
if (Objects.nonNull(p.getMAQwaterDropsImages())) {
waterDropsMap.putAll(p.getMAQwaterDropsImages());
}
--
Gitblit v1.9.1