From 8e76fba031022a2bb99795a2678c62db33a5ebfd Mon Sep 17 00:00:00 2001
From: linzhijie <19970921lzj>
Date: 星期三, 24 三月 2021 19:27:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tai-ots-master-20210316' into Dev
---
src/main/java/com/ots/project/exam/service/impl/TExamPaperServiceImpl.java | 45 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 44 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ots/project/exam/service/impl/TExamPaperServiceImpl.java b/src/main/java/com/ots/project/exam/service/impl/TExamPaperServiceImpl.java
index 7a54b0a..2bab5f6 100644
--- a/src/main/java/com/ots/project/exam/service/impl/TExamPaperServiceImpl.java
+++ b/src/main/java/com/ots/project/exam/service/impl/TExamPaperServiceImpl.java
@@ -3,6 +3,8 @@
import cn.hutool.core.collection.CollUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.ots.common.enums.LangTypeEnum;
+import com.ots.common.enums.ReportTitle;
import com.ots.common.enums.SenderCode;
import com.ots.common.enums.UserTypeEnum;
import com.ots.common.utils.DateUtils;
@@ -32,6 +34,7 @@
import com.ots.project.tool.report.reportCalculation.request.*;
import com.ots.project.tool.report.reportCalculation.response.ReportAPIResult;
import lombok.extern.slf4j.Slf4j;
+import org.apache.velocity.runtime.directive.Foreach;
import org.modelmapper.ModelMapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -859,7 +862,11 @@
}
// 璋冪敤鍙戦�佺▼搴忓彂缁欑敤鎴�
- String title = tExamReportResult.getMemberName() + MessageUtils.message("jsp.exam.quesiton.reportTilte");
+ //String title = tExamReportResult.getMemberName() + MessageUtils.message("jsp.exam.quesiton.reportTilte");
+ String title = getTitle(tExamReportResult);
+
+ log.error("鎶ュ憡鏍囬:{}",title);
+
String content = tExamReportResult.getMailContent();
StringBuilder remark = new StringBuilder();
remark.append("澶辫触閭锛�");
@@ -1246,4 +1253,40 @@
}
+ /***
+ * 鑾峰彇鎶ュ憡濉啓璇█,杩斿洖鏍囬
+ */
+ private String getTitle(TExamReport tExamReportResult){
+ String title = tExamReportResult.getMemberName() + MessageUtils.message("jsp.exam.quesiton.reportTilte");
+ //鎶ュ憡鍐呭璺熸祴璇曚骇鍝佸悕绉颁笉涓虹┖
+ if(StringUtils.isNotEmpty(tExamReportResult.getContent()) && StringUtils.isNotEmpty(tExamReportResult.getProductName())){
+ JSONArray content = JSONObject.parseArray(tExamReportResult.getContent());
+ //鑾峰彇璇█
+ String langType = content.getJSONObject(0).getString("langType");
+ String field = ReportTitle.getField(langType);
+ String name = "";
+ for (int i = 0; i < content.size(); i++) {
+ JSONObject jsonObject = content.getJSONObject(i);
+ if(StringUtils.isNotEmpty(field) && field.equals(jsonObject.getString("field"))){
+ name = jsonObject.getString("value");
+ break;
+ }
+ }
+
+ //鑾峰彇浜у搧鍚嶇О
+ JSONObject productNameObj = JSONObject.parseObject(tExamReportResult.getProductName());
+ String productName = productNameObj.getString(langType);
+
+ if(StringUtils.isNotEmpty(name) && StringUtils.isNotEmpty(productName) && StringUtils.isNotEmpty(langType)){
+ //娉版枃鏄厛鎶ュ憡鍚嶇О鍚庡鍚� 鍏朵粬鐩稿弽
+ if(langType.equals(LangTypeEnum.Thai.getCode())){
+ title = String.format(ReportTitle.getReportTitle(langType),productName,name);
+ }else{
+ title = String.format(ReportTitle.getReportTitle(langType),name,productName);
+ }
+ }
+ }
+ return title;
+ }
+
}
--
Gitblit v1.9.1