From 3a8e1524dcf0eeb610d38123d5f0a3ef838379cd Mon Sep 17 00:00:00 2001
From: linzhijie <19970921lzj>
Date: 星期一, 12 四月 2021 15:44:53 +0800
Subject: [PATCH] Merge branch '20210406-maqv2' into 20210412-youhua
---
src/main/java/com/ots/project/exam/service/impl/TExamPaperServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 2bab5f6..db0c951 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
@@ -1,5 +1,4 @@
package com.ots.project.exam.service.impl;
-
import cn.hutool.core.collection.CollUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
@@ -42,10 +41,8 @@
import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-
import java.util.*;
import java.util.stream.Collectors;
-
import static com.ots.project.tool.report.reportCalculation.request.CalculationTypeEnum.*;
import static com.ots.project.tool.report.reportCalculation.request.ReportTypeEnum.firstPath;
import static com.ots.project.tool.report.reportCalculation.request.ReportTypeEnum.secondPath;
@@ -868,12 +865,15 @@
log.error("鎶ュ憡鏍囬:{}",title);
String content = tExamReportResult.getMailContent();
+ //娴嬭瘯鑰呮帴鏀舵姤鍛婃ā鏉夸紭鍏堜娇鐢ㄦ祴璇曞寘淇濆瓨鐨勬姤鍛婃ā鏉�
+ String memberContent = tExamReportResult.getMemberTemplate();
+
StringBuilder remark = new StringBuilder();
remark.append("澶辫触閭锛�");
if (justMember) {
// 鐢ㄦ埛鍙戦偖浠�
- sendMemberEmail(tExamReport, fileNameResult, tExamReportResult, title, content, remark);
+ sendMemberEmail(tExamReport, fileNameResult, tExamReportResult, title, memberContent, remark);
}
if (justHr) {
// 鍙戦�佺粰Hr,浣嗗彇testEmail
--
Gitblit v1.9.1