modify：供应商邮件抄送

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

@@ -641,9 +641,15 @@ public class ChangeFlowBiz {
                         EmailTemplateEnum.YX_QC_CHANGE_EXECUTE, param);
                 // 如果是供应商，再次发送供应商邮件
                 if (changeRecord.getCreateSource().equals(CreateSourceEnum.TONG_ZHOU.getType())) {
-                    sendSupplierEmail.sendSupplierEmail(changeRecord.getChangeSupplier(), subjectParam,
+                    sendSupplierEmail.sendSupplierEmail(changeRecord.getCreateSupplier(), subjectParam,
                             EmailTemplateEnum.YX_QC_CHANGE_EXECUTE, param);
                 }
+                // 如果是其他端发起但是是供应商变更，再次发送供应商邮件
+                if (!changeRecord.getCreateSource().equals(CreateSourceEnum.TONG_ZHOU.getType())
+                        && ChangeSubjectEnum.SUPPLIER.getType().equals(changeRecord.getChangeSubject())) {
+                    sendSupplierEmail.sendSupplierEmail(changeRecord.getChangeSupplier(), subjectParam,
+                            EmailTemplateEnum.YX_QC_CHANGE_AFFIRM, param);
+                }
                 return submitNode;
             case CHANGE_FLOW_CONFIRM:
                 Integer changeResult = changeFlowSubmitReq.getChangeResult();
@@ -717,15 +723,21 @@ public class ChangeFlowBiz {
                         userEmailList.add(changeRecord.getChangeCommander());
                         userEmailList.add(appConfig.getChangeManageQM());
                         if (changeRecord.getCreateSource().equals(CreateSourceEnum.TONG_ZHOU.getType())) {
-                            userEmailList.add(changeRecord.getChangeSupplier());
+                            userEmailList.add(changeRecord.getCreateSupplier());
                         }
                         qcSendEmail(userEmailList, list, finishSubjectParam,
                                 EmailTemplateEnum.YX_QC_CHANGE_FINISH, finishPartMap);
                         // 如果是供应商，再次发送供应商邮件
                         if (changeRecord.getCreateSource().equals(CreateSourceEnum.TONG_ZHOU.getType())) {
-                            sendSupplierEmail.sendSupplierEmail(changeRecord.getChangeSupplier(), finishSubjectParam,
+                            sendSupplierEmail.sendSupplierEmail(changeRecord.getCreateSupplier(), finishSubjectParam,
                                     EmailTemplateEnum.YX_QC_CHANGE_FINISH, finishPartMap);
                         }
+                        // 如果是其他端发起但是是供应商变更，再次发送供应商邮件
+                        if (!changeRecord.getCreateSource().equals(CreateSourceEnum.TONG_ZHOU.getType())
+                                && ChangeSubjectEnum.SUPPLIER.getType().equals(changeRecord.getChangeSubject())) {
+                            sendSupplierEmail.sendSupplierEmail(changeRecord.getChangeSupplier(), finishSubjectParam,
+                                    EmailTemplateEnum.YX_QC_CHANGE_AFFIRM, finishPartMap);
+                        }
                         return confirmNode;
                     case CANCEL:
                         // 取消填写取消原因
@@ -773,15 +785,21 @@ public class ChangeFlowBiz {
                         userEmails.add(changeRecord.getChangeCommander());
                         userEmails.add(appConfig.getChangeManageQM());
                         if (changeRecord.getCreateSource().equals(CreateSourceEnum.TONG_ZHOU.getType())) {
-                            userEmails.add(changeRecord.getChangeSupplier());
+                            userEmails.add(changeRecord.getCreateSupplier());
                         }
                         qcSendEmail(userEmails, departmentInfoList, cancelFinishSubjectParam,
                                 EmailTemplateEnum.YX_QC_CHANGE_FINISH, cancelMap);
                         // 如果是供应商，再次发送供应商邮件
                         if (changeRecord.getCreateSource().equals(CreateSourceEnum.TONG_ZHOU.getType())) {
-                            sendSupplierEmail.sendSupplierEmail(changeRecord.getChangeSupplier(), cancelFinishSubjectParam,
+                            sendSupplierEmail.sendSupplierEmail(changeRecord.getCreateSupplier(), cancelFinishSubjectParam,
                                     EmailTemplateEnum.YX_QC_CHANGE_FINISH, cancelMap);
                         }
+                        // 如果是其他端发起但是是供应商变更，再次发送供应商邮件
+                        if (!changeRecord.getCreateSource().equals(CreateSourceEnum.TONG_ZHOU.getType())
+                                && ChangeSubjectEnum.SUPPLIER.getType().equals(changeRecord.getChangeSubject())) {
+                            sendSupplierEmail.sendSupplierEmail(changeRecord.getChangeSupplier(), cancelFinishSubjectParam,
+                                    EmailTemplateEnum.YX_QC_CHANGE_AFFIRM, cancelMap);
+                        }
                         return cancelNode;
                     case DELAY:
                         // 延期不流转工单
@@ -880,9 +898,15 @@ public class ChangeFlowBiz {
         qcSendEmail(receiver, ccList, cancelSubjectParam, EmailTemplateEnum.YX_QC_CHANGE_SUBMIT_CANCEL, cancelMap);
         // 如果是供应商，再次发送供应商邮件
         if (changeRecord.getCreateSource().equals(CreateSourceEnum.TONG_ZHOU.getType())) {
-            sendSupplierEmail.sendSupplierEmail(changeRecord.getChangeSupplier(), cancelSubjectParam,
+            sendSupplierEmail.sendSupplierEmail(changeRecord.getCreateSupplier(), cancelSubjectParam,
                     EmailTemplateEnum.YX_QC_CHANGE_SUBMIT_CANCEL, cancelMap);
         }
+        // 如果是其他端发起但是是供应商变更，再次发送供应商邮件
+        if (!changeRecord.getCreateSource().equals(CreateSourceEnum.TONG_ZHOU.getType())
+                && ChangeSubjectEnum.SUPPLIER.getType().equals(changeRecord.getChangeSubject())) {
+            sendSupplierEmail.sendSupplierEmail(changeRecord.getChangeSupplier(), cancelSubjectParam,
+                    EmailTemplateEnum.YX_QC_CHANGE_AFFIRM, cancelMap);
+        }
         return changeFlowService.updateRecord(changeRecord);
     }
 
@@ -1281,19 +1305,19 @@ public class ChangeFlowBiz {
         changeRecord.setRemark(remark);
         changeRecord.setUpdateTime(DateUtils.getCurrentTime());
 
-        Map<String, Object> cancelMap = new HashMap<>();
-        cancelMap.put("changeId", changeRecord.getFlowId());
-        cancelMap.put("changeSubject", ChangeSubjectEnum.getChangeSubjectEnum(changeRecord.getChangeSubject()).getDesc());
-        cancelMap.put("changeContent", changeRecord.getChangeContent());
+        Map<String, Object> deliverMap = new HashMap<>();
+        deliverMap.put("changeId", changeRecord.getFlowId());
+        deliverMap.put("changeSubject", ChangeSubjectEnum.getChangeSubjectEnum(changeRecord.getChangeSubject()).getDesc());
+        deliverMap.put("changeContent", changeRecord.getChangeContent());
         // 转交人名称
         AjaxResponse<IusUserInfoRsp> oldUser = iusRpcService.queryUserInfo(changeCommander);
-        cancelMap.put("changeCommander", oldUser.getData().getName());
-        cancelMap.put("changeCommanderEmail", changeCommander);
+        deliverMap.put("changeCommander", oldUser.getData().getName());
+        deliverMap.put("changeCommanderEmail", changeCommander);
         // 被转交人名称
         AjaxResponse<IusUserInfoRsp> newUser = iusRpcService.queryUserInfo(deliverUser);
-        cancelMap.put("restsChangeCommander", newUser.getData().getName());
-        cancelMap.put("restsChangeCommanderEmail", deliverUser);
-        String cancelSubjectParam = changeRecord.getFlowId().toString();
+        deliverMap.put("restsChangeCommander", newUser.getData().getName());
+        deliverMap.put("restsChangeCommanderEmail", deliverUser);
+        String deliverSubjectParam = changeRecord.getFlowId().toString();
         // 转交，收件人：变更转交人（工单接收人）、变更负责人（工单转交人）
         List<String> receiver = Arrays.asList(changeCommander, deliverUser);
         // 转交，抄送人：变更发起人+原变更负责人上一级主管、变更转交人（工单接收人）上一级主管+变更行动项负责人
@@ -1304,11 +1328,17 @@ public class ChangeFlowBiz {
         List<String> userEmailList = execRecord.stream().map(ChangeFlowExecVO::getChangeExecUserEmail)
                 .collect(Collectors.toList());
         ccList.addAll(userEmailList);
-        qcSendEmail(receiver, ccList, cancelSubjectParam, EmailTemplateEnum.YX_QC_CHANGE_SUBMIT_FORWARD, cancelMap);
+        qcSendEmail(receiver, ccList, deliverSubjectParam, EmailTemplateEnum.YX_QC_CHANGE_SUBMIT_FORWARD, deliverMap);
         // 如果是供应商，再次发送供应商邮件
         if (changeRecord.getCreateSource().equals(CreateSourceEnum.TONG_ZHOU.getType())) {
-            sendSupplierEmail.sendSupplierEmail(changeRecord.getChangeSupplier(), cancelSubjectParam,
-                    EmailTemplateEnum.YX_QC_CHANGE_SUBMIT_FORWARD, cancelMap);
+            sendSupplierEmail.sendSupplierEmail(changeRecord.getCreateSupplier(), deliverSubjectParam,
+                    EmailTemplateEnum.YX_QC_CHANGE_SUBMIT_FORWARD, deliverMap);
+        }
+        // 如果是其他端发起但是是供应商变更，再次发送供应商邮件
+        if (!changeRecord.getCreateSource().equals(CreateSourceEnum.TONG_ZHOU.getType())
+                && ChangeSubjectEnum.SUPPLIER.getType().equals(changeRecord.getChangeSubject())) {
+            sendSupplierEmail.sendSupplierEmail(changeRecord.getChangeSupplier(), deliverSubjectParam,
+                    EmailTemplateEnum.YX_QC_CHANGE_AFFIRM, deliverMap);
         }
         changeFlowService.updateRecord(changeRecord);
     }

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

@@ -158,8 +158,14 @@ public class AutoSubmit extends IJobHandler {
         userEmailList.add(appConfig.getChangeManageQM());
         changeFlowBiz.qcSendEmail(receiver, userEmailList, subjectParam,
             EmailTemplateEnum.YX_QC_CHANGE_AFFIRM, map);
-        // 如果是供应商，再次发送供应商邮件
+        // 如果是供应商发起，再次发送供应商邮件
         if (changeRecord.getCreateSource().equals(CreateSourceEnum.TONG_ZHOU.getType())) {
+            sendSupplierEmail.sendSupplierEmail(changeRecord.getCreateSupplier(), subjectParam,
+                EmailTemplateEnum.YX_QC_CHANGE_AFFIRM, map);
+        }
+        // 如果是其他端发起但是是供应商变更，再次发送供应商邮件
+        if (!changeRecord.getCreateSource().equals(CreateSourceEnum.TONG_ZHOU.getType())
+            && ChangeSubjectEnum.SUPPLIER.getType().equals(changeRecord.getChangeSubject())) {
             sendSupplierEmail.sendSupplierEmail(changeRecord.getChangeSupplier(), subjectParam,
                     EmailTemplateEnum.YX_QC_CHANGE_AFFIRM, map);
         }