modify:修改邮件内容

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

@@ -268,7 +268,7 @@ public class ChangeFlowBiz {
         }
         param.put("changeType", changeType.toString());
         param.put("flowUrl", changeRecord.getFlowId());
-        String subjectParam = changeRecord.getId().toString();
+        String subjectParam = changeRecord.getFlowId().toString();
         qcSendEmail(changeCommander, subjectParam, EmailTemplateEnum.YX_QC_CHANGE_RELEASE_FLOW, param);
         // 如果是供应商，再次发送供应商邮件
         if (changeFlowCreateReq.getCreateSource().equals(CreateSourceEnum.TONG_ZHOU.getType())) {
@@ -493,15 +493,16 @@ public class ChangeFlowBiz {
                     changeFiles.forEach(file -> changeFileService.saveRecord(file));
                 }
                 HashMap<String, Object> param = new HashMap<>();
-                param.put("changeId", changeRecord.getId());
-                param.put("changeSubject", changeRecord.getChangeSubject());
+                param.put("changeId", changeRecord.getFlowId());
+                param.put("changeSubject", ChangeSubjectEnum.getChangeSubjectEnum(changeRecord.getChangeSubject()).getDesc());
                 param.put("changeContent", changeRecord.getChangeContent());
                 param.put("changeReason", changeRecord.getChangeReason());
-                param.put("changeCommander", changeRecord.getChangeCommander());
+                AjaxResponse<IusUserInfoRsp> user = iusRpcService.queryUserInfo(changeRecord.getChangeCommander());
+                param.put("changeCommander", user.getData().getName());
                 param.put("changeCommanderEmail", changeRecord.getChangeCommander());
                 param.put("flowUrl", changeRecord.getFlowId());
                 param.put("dataList", changeExecRecords);
-                String subjectParam = changeRecord.getId().toString();
+                String subjectParam = changeRecord.getFlowId().toString();
                 qcSendEmail(changeRecord.getChangeCommander(), subjectParam,
                         EmailTemplateEnum.YX_QC_CHANGE_EXECUTE, param);
                 // 如果是供应商，再次发送供应商邮件
@@ -543,8 +544,8 @@ public class ChangeFlowBiz {
                         todoService.progressTodoTask(changeRecord, OperateTypeEnum.FINISH.getType());
                         // 发送邮件
                         HashMap<String, Object> finishPartMap = new HashMap<>();
-                        finishPartMap.put("changeId", changeRecord.getId());
-                        finishPartMap.put("changeSubject", changeRecord.getChangeSubject());
+                        finishPartMap.put("changeId", changeRecord.getFlowId());
+                        finishPartMap.put("changeSubject", ChangeSubjectEnum.getChangeSubjectEnum(changeRecord.getChangeSubject()).getDesc());
                         finishPartMap.put("flowUrl", changeRecord.getFlowId());
                         ChangeConfigPo changeConfigPo = changeConfigService
                                 .queryInfoPo(changeRecord.getParentChangeClassId(), changeRecord.getSonChangeClassId());
@@ -560,8 +561,8 @@ public class ChangeFlowBiz {
                             log.error("queryInfoPo error:{}", JSON.toJSONString(changeConfigPo));
                         }
                         //【已完结】变更主体+变更内容+工单ID 变更风险行动项已完结，请开始执行变更。
-                        String finishSubjectParam = changeRecord.getChangeSubject() + changeRecord.getChangeContent()
-                                + changeRecord.getId();
+                        String finishSubjectParam = ChangeSubjectEnum.getChangeSubjectEnum(changeRecord.getChangeSubject()).getDesc() + changeRecord.getChangeContent()
+                                + changeRecord.getFlowId();
                         qcSendEmail(changeRecord.getChangeCommander(), finishSubjectParam,
                                 EmailTemplateEnum.YX_QC_CHANGE_FINISH, finishPartMap);
                         // 如果是供应商，再次发送供应商邮件
@@ -588,10 +589,10 @@ public class ChangeFlowBiz {
                         cancelMap.put("changeId", changeRecord.getFlowId());
                         cancelMap.put("changeSubject", ChangeSubjectEnum.getChangeSubjectEnum(changeRecord.getChangeSubject()).getDesc());
                         cancelMap.put("changeContent", changeRecord.getChangeContent());
-                        AjaxResponse<IusUserInfoRsp> user = iusRpcService.queryUserInfo(changeRecord.getChangeCommander());
-                        cancelMap.put("changeCommander", user.getData().getName());
+                        AjaxResponse<IusUserInfoRsp> userInfo = iusRpcService.queryUserInfo(changeRecord.getChangeCommander());
+                        cancelMap.put("changeCommander", userInfo.getData().getName());
                         cancelMap.put("cancelReason", changeRecord.getCancelReason());
-                        String cancelSubjectParam = changeRecord.getId().toString();
+                        String cancelSubjectParam = changeRecord.getFlowId().toString();
                         qcSendEmail(changeRecord.getChangeCommander(), cancelSubjectParam,
                                 EmailTemplateEnum.YX_QC_CHANGE_SUBMIT_CANCEL, cancelMap);
                         // 如果是供应商，再次发送供应商邮件
@@ -683,12 +684,13 @@ public class ChangeFlowBiz {
         changeRecord.setUpdateTime(DateUtils.getCurrentTime());
         todoService.progressTodoTask(changeRecord, OperateTypeEnum.FINISH.getType());
         Map<String, Object> cancelMap = new HashMap<>();
-        cancelMap.put("changeId", changeRecord.getId());
-        cancelMap.put("changeSubject", changeRecord.getChangeSubject());
+        cancelMap.put("changeId", changeRecord.getFlowId());
+        cancelMap.put("changeSubject", ChangeSubjectEnum.getChangeSubjectEnum(changeRecord.getChangeSubject()).getDesc());
         cancelMap.put("changeContent", changeRecord.getChangeContent());
-        cancelMap.put("changeCommander", changeRecord.getChangeCommander());
+        AjaxResponse<IusUserInfoRsp> user = iusRpcService.queryUserInfo(changeRecord.getChangeCommander());
+        cancelMap.put("changeCommander", user.getData().getName());
         cancelMap.put("cancelReason", changeRecord.getCancelReason());
-        String cancelSubjectParam = changeRecord.getId().toString();
+        String cancelSubjectParam = changeRecord.getFlowId().toString();
         qcSendEmail(changeCommander, cancelSubjectParam, EmailTemplateEnum.YX_QC_CHANGE_SUBMIT_CANCEL, cancelMap);
         // 如果是供应商，再次发送供应商邮件
         if (changeRecord.getCreateSource().equals(CreateSourceEnum.TONG_ZHOU.getType())) {
@@ -1087,7 +1089,7 @@ public class ChangeFlowBiz {
         AjaxResponse<IusUserInfoRsp> newUser = iusRpcService.queryUserInfo(deliverUser);
         cancelMap.put("restsChangeCommander", newUser.getData().getName());
         cancelMap.put("restsChangeCommanderEmail", deliverUser);
-        String cancelSubjectParam = changeRecord.getId().toString();
+        String cancelSubjectParam = changeRecord.getFlowId().toString();
         qcSendEmail(changeCommander, cancelSubjectParam, EmailTemplateEnum.YX_QC_CHANGE_SUBMIT_FORWARD, cancelMap);
         // 如果是供应商，再次发送供应商邮件
         if (changeRecord.getCreateSource().equals(CreateSourceEnum.TONG_ZHOU.getType())) {

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

@@ -12,6 +12,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import com.netease.mail.yanxuan.change.common.enums.*;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -23,10 +24,6 @@ import com.netease.mail.yanxuan.change.biz.service.change.ChangeConfigService;
 import com.netease.mail.yanxuan.change.biz.service.rpc.FlowService;
 import com.netease.mail.yanxuan.change.biz.service.rpc.SupplierSendService;
 import com.netease.mail.yanxuan.change.common.bean.CommonConstants;
-import com.netease.mail.yanxuan.change.common.enums.ChangeFlowEnum;
-import com.netease.mail.yanxuan.change.common.enums.CreateSourceEnum;
-import com.netease.mail.yanxuan.change.common.enums.FlowOperationTypeEnum;
-import com.netease.mail.yanxuan.change.common.enums.FlowxOperationEnum;
 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;
@@ -120,8 +117,8 @@ public class AutoSubmit extends IJobHandler {
         }
         // 发送邮件
         HashMap<String, Object> map = new HashMap<>();
-        map.put("changeId", changeRecord.getId());
-        map.put("changeSubject", changeRecord.getChangeSubject());
+        map.put("changeId", changeRecord.getFlowId());
+        map.put("changeSubject", ChangeSubjectEnum.getChangeSubjectEnum(changeRecord.getChangeSubject()).getDesc());
         map.put("flowUrl", changeRecord.getFlowId());
         ChangeConfigPo changeConfigPo = changeConfigService.queryInfoPo(changeRecord.getParentChangeClassId(),
             changeRecord.getSonChangeClassId());
@@ -136,8 +133,8 @@ public class AutoSubmit extends IJobHandler {
         } catch (Exception e) {
             log.error("queryInfoPo error:{}", JSON.toJSONString(changeConfigPo));
         }
-        String subjectParam = changeRecord.getChangeSubject() + changeType.toString()
-                + changeRecord.getId().toString();
+        String subjectParam = ChangeSubjectEnum.getChangeSubjectEnum(changeRecord.getChangeSubject()).getDesc() + changeType
+                + changeRecord.getFlowId().toString();
         changeFlowBiz.qcSendEmail(changeRecord.getChangeCommander(), subjectParam,
             EmailTemplateEnum.YX_QC_CHANGE_AFFIRM, map);
         // 如果是供应商，再次发送供应商邮件