modify：邮件发送完善

yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/config/AppConfig.java

@@ -6,6 +6,8 @@
  */
 package com.netease.mail.yanxuan.change.biz.config;
 
+import java.util.List;
+
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
@@ -33,8 +35,8 @@ public class AppConfig {
     @Value("${testEmail:A@163.com}")
     private String testEmail;
 
-    @Value("${sendEmail:wb.wangzhichao01@mesg.corp.netease.com}")
-    private String sendEmail;
+    @Value("${sendEmail:[\"wb.wangzhichao01@mesg.corp.netease.com\"]}")
+    private List<String> receiver;
 
     @Value("${change.goods.principal.name:aaa}")
     private String defaultName;
@@ -54,6 +56,12 @@ public class AppConfig {
     @Value("${changeManageQM:cuiyixian@corp.netease.com}")
     private String changeManageQM;
 
+    /**
+     * 变更管理委员会
+     */
+    @Value("${changeCommittee:yx_change_SC@qun.mail.163.com}")
+    private String changeCommittee;
+
     @Value("${exportLimit:20}")
     private Long exportLimit;
 }
\ No newline at end of file

yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/service/rpc/IusService.java

@@ -37,14 +37,14 @@ public class IusService {
     public HashMap<String, List<SecondaryDepartments>> queryDepartment(IusDepartmentReq iusDepartmentReq) {
         log.info("[queryDepartment] queryDepartment req:{}", JSON.toJSONString(iusDepartmentReq));
         AjaxResponse<HashMap<String, List<SecondaryDepartments>>> response = iusRpcService.queryDepartment(iusDepartmentReq);
-        HashMap<String, List<SecondaryDepartments>> map;
+        log.info("[queryDepartment] response of queryDepartment ={}",
+                JSON.toJSONString(response));
         if (ResponseCodeEnum.SUCCESS.getCode() == response.getCode()) {
-            map = response.getData();
+            return response.getData();
         } else {
             log.error("[queryDepartment] queryDepartment failed, query={}, errMsg={}", JSON.toJSONString(iusDepartmentReq),
                     JSON.toJSONString(response));
             throw ExceptionFactory.createBiz(ResponseCode.CREATE_FLOW_ERROR, "查询部门错误");
         }
-        return map;
     }
 }
\ No newline at end of file

yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/task/AutoSubmit.java

@@ -7,11 +7,14 @@
 package com.netease.mail.yanxuan.change.biz.task;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import com.netease.mail.yanxuan.change.biz.config.AppConfig;
+import com.netease.mail.yanxuan.change.biz.service.ChangeFlowExecService;
 import com.netease.mail.yanxuan.change.common.enums.*;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,6 +30,7 @@ import com.netease.mail.yanxuan.change.common.bean.CommonConstants;
 import com.netease.mail.yanxuan.change.common.util.DateUtils;
 import com.netease.mail.yanxuan.change.dal.entity.ChangeRecord;
 import com.netease.mail.yanxuan.change.dal.meta.model.po.ChangeConfigPo;
+import com.netease.mail.yanxuan.change.dal.meta.model.vo.ChangeFlowExecVO;
 import com.netease.mail.yanxuan.change.integration.email.enums.EmailTemplateEnum;
 import com.netease.mail.yanxuan.dschedule.core.biz.model.ReturnT;
 import com.netease.mail.yanxuan.dschedule.core.handler.IJobHandler;
@@ -59,6 +63,12 @@ public class AutoSubmit extends IJobHandler {
     @Autowired
     private ChangeConfigService changeConfigService;
 
+    @Autowired
+    private ChangeFlowExecService changeFlowExecService;
+
+    @Autowired
+    private AppConfig appConfig;
+
     @Override
     public ReturnT<String> execute(String... strings) throws Exception {
         log.info("AutoSubmit start");
@@ -135,7 +145,15 @@ public class AutoSubmit extends IJobHandler {
         }
         String subjectParam = ChangeSubjectEnum.getChangeSubjectEnum(changeRecord.getChangeSubject()).getDesc() + changeType
                 + changeRecord.getFlowId().toString();
-        changeFlowBiz.qcSendEmail(changeRecord.getChangeCommander(), subjectParam,
+        // 变更结果确认，收件人：变更负责人
+        List<String> receiver = Collections.singletonList(changeRecord.getChangeCommander());
+        //  变更结果确认，抄送：所有行动项负责人+变更管理QM
+        List<ChangeFlowExecVO> execRecord = changeFlowExecService
+                .getChangeFlowExecRecord(changeRecord.getId());
+        List<String> userEmailList = execRecord.stream().map(ChangeFlowExecVO::getChangeExecUserEmail)
+                .collect(Collectors.toList());
+        userEmailList.add(appConfig.getChangeManageQM());
+        changeFlowBiz.qcSendEmail(receiver, userEmailList, subjectParam,
             EmailTemplateEnum.YX_QC_CHANGE_AFFIRM, map);
         // 如果是供应商，再次发送供应商邮件
         if (changeRecord.getCreateSource().equals(CreateSourceEnum.TONG_ZHOU.getType())) {

yanxuan-qc-change-system-web/src/main/java/com/netease/mail/yanxuan/change/web/controller/TestController.java

@@ -113,7 +113,7 @@ public class TestController {
         String mapToJson = req.getMapToJson();
         log.debug("[testSendEmail] subjectParam:{}, emailTemplateEnum:{}, mapToJson:{}", subjectParam,
             emailTemplateEnum, mapToJson);
-        changeFlowBiz.qcSendEmail(appConfig.getSendEmail(), subjectParam,
+        changeFlowBiz.qcSendEmail(appConfig.getReceiver(), appConfig.getReceiver(), subjectParam,
                         emailTemplateEnum, JSON.parseObject(mapToJson, Map.class));
         // 如果是供应商，再次发送供应商邮件
         if (req.getCreateSource().equals(CreateSourceEnum.TONG_ZHOU.getType())) {