Merge branch '20210406-maqv2' into 20210412-youhua

linzhijie

2021-04-12 3a8e1524dcf0eeb610d38123d5f0a3ef838379cd

 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