modify:修改邮件内容

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

@@ -40,6 +40,7 @@ import com.netease.mail.yanxuan.change.integration.flow.UserQueryDTO;
 import com.netease.mail.yanxuan.change.integration.flow.ius.IusRpcService;
 import com.netease.mail.yanxuan.change.integration.flow.ius.req.IusDepartmentReq;
 import com.netease.mail.yanxuan.change.integration.flow.ius.rsp.IusUserInfoRsp;
+import com.netease.mail.yanxuan.change.integration.flow.ius.rsp.OrgPosLeaderChainRsp;
 import com.netease.mail.yanxuan.change.integration.flow.ius.rsp.SecondaryDepartments;
 import com.netease.mail.yanxuan.change.integration.item.SimplePhyCateGoryResultCo;
 import com.netease.mail.yanxuan.change.integration.item.meta.SpuTO;
@@ -218,11 +219,12 @@ public class ChangeFlowBiz {
             changeRecord.setUpdateTime(DateUtils.getCurrentTime());
             changeFlowService.updateRecord(changeRecord);
             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);
@@ -238,8 +240,8 @@ public class ChangeFlowBiz {
             } 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();
             qcSendEmail(changeCommander, subjectParam, EmailTemplateEnum.YX_QC_CHANGE_EXECUTE, param);
             // 如果是供应商，再次发送供应商邮件
             if (changeFlowCreateReq.getCreateSource().equals(CreateSourceEnum.TONG_ZHOU.getType())) {
@@ -583,10 +585,11 @@ public class ChangeFlowBiz {
                         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();
                         qcSendEmail(changeRecord.getChangeCommander(), cancelSubjectParam,
@@ -1073,15 +1076,17 @@ public class ChangeFlowBiz {
         changeRecord.setUpdateTime(DateUtils.getCurrentTime());
 
         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());
-        // todo:负责人名称
-        cancelMap.put("changeCommander", null);
-        cancelMap.put("changeCommanderEmail", changeRecord.getChangeCommander());
-        // todo:负责人名称
-        cancelMap.put("restsChangeCommander", null);
-        cancelMap.put("restsChangeCommanderEmail", changeRecord.getChangeCommander());
+        // 转交人名称
+        AjaxResponse<IusUserInfoRsp> oldUser = iusRpcService.queryUserInfo(changeCommander);
+        cancelMap.put("changeCommander", oldUser.getData().getName());
+        cancelMap.put("changeCommanderEmail", changeCommander);
+        // 被转交人名称
+        AjaxResponse<IusUserInfoRsp> newUser = iusRpcService.queryUserInfo(deliverUser);
+        cancelMap.put("restsChangeCommander", newUser.getData().getName());
+        cancelMap.put("restsChangeCommanderEmail", deliverUser);
         String cancelSubjectParam = changeRecord.getId().toString();
         qcSendEmail(changeCommander, cancelSubjectParam, EmailTemplateEnum.YX_QC_CHANGE_SUBMIT_FORWARD, cancelMap);
         // 如果是供应商，再次发送供应商邮件