modify:修改操作历史

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

@@ -126,6 +126,7 @@ public class ChangeFlowBiz {
 
     public String createAndSubmit(ChangeFlowCreateReq changeFlowCreateReq) {
         String uid = RequestLocalBean.getUid();
+        String name = RequestLocalBean.getName();
         log.info("[create] createReq={}, uid:{}", JSON.toJSONString(changeFlowCreateReq), uid);
         // 校验变更主体
         checkSubject(changeFlowCreateReq);
@@ -174,7 +175,7 @@ public class ChangeFlowBiz {
         content.put(CommonConstants.FLOW_OPERATION_KEY, FlowOperationTypeEnum.PASS.getValue());
         // 组装工单创建数据
         FlowCreateReqDTO flowCreateReqDTO = buildFlowCreateReqDTO(ChangeFlowEnum.CHANGE_FLOW_START.getTopoId(), uid,
-                JSON.toJSONString(content), FlowxOperationEnum.CREATE.getName());
+                JSON.toJSONString(content), FlowxOperationEnum.CREATE.getName(), name);
         // 创建工单
         String flowId = flowService.createFlow(flowCreateReqDTO);
         // 查询工单详情
@@ -360,11 +361,11 @@ public class ChangeFlowBiz {
         }
     }
 
-    private FlowCreateReqDTO buildFlowCreateReqDTO(String topoId, String uid, String content, String operateResult) {
+    private FlowCreateReqDTO buildFlowCreateReqDTO(String topoId, String uid, String content, String operateResult, String name) {
         FlowCreateReqDTO flowCreateReqDTO = new FlowCreateReqDTO();
         flowCreateReqDTO.setTopoId(topoId);
         flowCreateReqDTO.setUid(uid);
-        flowCreateReqDTO.setUserName(uid);
+        flowCreateReqDTO.setUserName(name);
         flowCreateReqDTO.setOperateResult(operateResult);
         flowCreateReqDTO.setWorkOrderId(StringUtils.joinWith("-", topoId, UUID.randomUUID().toString()));
         flowCreateReqDTO.setContent(content);
@@ -1052,6 +1053,7 @@ public class ChangeFlowBiz {
                 ChangeFlowEnum.CHANGE_FLOW_CONFIRM.getNodeId());
         this.checkNode(changeRecord.getFlowNode(), nodeList);
         String uid = RequestLocalBean.getUid();
+        String name = RequestLocalBean.getName();
         String changeCommander = changeRecord.getChangeCommander();
         if (!uid.equals(changeCommander)) {
             throw ExceptionFactory.createBiz(ResponseCode.NO_AUTH, ResponseCode.NO_AUTH.getMsg());
@@ -1069,7 +1071,7 @@ public class ChangeFlowBiz {
         content.put("updateTime", System.currentTimeMillis());
         flowService.updateApprovers(ChangeFlowEnum.CHANGE_FLOW_EXE.getTopoId(), flowId.toString(),
                 changeRecord.getFlowNode(), Collections.singletonList(userBaseDTO), uid,
-                uid, remark, JSON.toJSONString(content));
+                name, remark, JSON.toJSONString(content));
         // 待办转交
         todoService.progressTodoTask(changeRecord, OperateTypeEnum.DELIVER.getType());
         // 更新工单负责人

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

@@ -8,6 +8,7 @@ package com.netease.mail.yanxuan.change.biz.service.rpc;
 
 import java.util.List;
 
+import com.netease.mail.yanxuan.change.common.bean.RequestLocalBean;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -75,11 +76,12 @@ public class FlowService {
      */
     public String submitFlow(String flowId, FlowDataDTO flowDataDTO, String uid, String topoId, String content,
         boolean approved, String operateResult, String remark) {
+        String name = RequestLocalBean.getName();
         NodeSubmitReqDTO nodeSubmitReqDTO = new NodeSubmitReqDTO();
         nodeSubmitReqDTO.setFlowId(flowId);
         nodeSubmitReqDTO.setNodeId(flowDataDTO.getFlowMeta().getCurrNodeDataList().get(0).getNodeId());
         nodeSubmitReqDTO.setUid(uid);
-        nodeSubmitReqDTO.setUserName(uid);
+        nodeSubmitReqDTO.setUserName(name);
         nodeSubmitReqDTO.setTopoId(topoId);
         nodeSubmitReqDTO.setContent(content);
         nodeSubmitReqDTO.setOperateResult(operateResult);