modify: 提交工单创建时间修改

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

@@ -299,7 +299,7 @@ public class ChangeFlowBiz {
             log.debug("[createAndSubmit] changeCommander:{}, uid:{}", changeCommander, uid);
             String nextNodeId = flowService.submitFlow(flowId, flowDataDTO, uid,
                     ChangeFlowEnum.CHANGE_FLOW_SUBMIT.getTopoId(), JSON.toJSONString(content), true,
-                    FlowxOperationEnum.SUBMIT.getName(), "提交工单");
+                    FlowxOperationEnum.SUBMIT.getName(), "提交工单",changeRecord.getCreateTime());
             if (null == nextNodeId) {
                 throw ExceptionFactory.createBiz(ResponseCode.SUBMIT_FLOW_ERROR, "首次提交节点失败");
             }
@@ -595,7 +595,7 @@ public class ChangeFlowBiz {
                 // 提交工单
                 String submitNode = flowService.submitFlow(flowId.toString(), flowDataDTO, uid,
                         ChangeFlowEnum.CHANGE_FLOW_SUBMIT.getTopoId(), JSON.toJSONString(content), true,
-                        FlowxOperationEnum.SUBMIT.getName(), "提交工单");
+                        FlowxOperationEnum.SUBMIT.getName(), "提交工单", changeRecord.getCreateTime());
                 // 更新工单数据
                 changeRecord.setFlowNode(submitNode);
                 changeRecord.setState(ChangeStatusEnum.IN.getStatus());
@@ -704,7 +704,7 @@ public class ChangeFlowBiz {
                         // 完成直接完结
                         String confirmNode = flowService.submitFlow(flowId.toString(), flowDataDTO, uid,
                                 ChangeFlowEnum.CHANGE_FLOW_CONFIRM.getTopoId(), JSON.toJSONString(content), true,
-                                FlowxOperationEnum.SUBMIT.getName(), "提交工单");
+                                FlowxOperationEnum.SUBMIT.getName(), "提交工单", changeRecord.getCreateTime());
                         changeRecord.setState(ChangeStatusEnum.END.getStatus());
                         changeRecord.setFlowNode(confirmNode);
                         changeRecord.setUpdateTime(DateUtils.getCurrentTime());
@@ -764,7 +764,7 @@ public class ChangeFlowBiz {
                         changeRecord.setCancelReason(cancelReason);
                         String cancelNode = flowService.submitFlow(flowId.toString(), flowDataDTO, uid,
                                 ChangeFlowEnum.CHANGE_FLOW_CONFIRM.getTopoId(), JSON.toJSONString(content), true,
-                                FlowxOperationEnum.SUBMIT.getName(), "提交工单");
+                                FlowxOperationEnum.SUBMIT.getName(), "提交工单", changeRecord.getCreateTime());
                         changeRecord.setState(ChangeStatusEnum.END.getStatus());
                         changeRecord.setFlowNode(cancelNode);
                         changeRecord.setUpdateTime(DateUtils.getCurrentTime());
@@ -881,7 +881,7 @@ public class ChangeFlowBiz {
         content.put(CommonConstants.FLOW_OPERATION_KEY, FlowOperationTypeEnum.REFUSE.getValue());
         String nextNodeId = flowService.submitFlow(String.valueOf(flowId), flowDataDTO, uid,
                 ChangeFlowEnum.CHANGE_FLOW_SUBMIT.getTopoId(), JSON.toJSONString(content), false,
-                FlowxOperationEnum.APPROVE_FAIL.getName(), "取消工单");
+                FlowxOperationEnum.APPROVE_FAIL.getName(), "取消工单", changeRecord.getCreateTime());
         log.info("[cancel] flowId:{}, nextNodeId:{}", flowId, nextNodeId);
         // 填充更新数据
         changeRecord.setFlowNode(nextNodeId);

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

@@ -72,10 +72,11 @@ public class FlowService {
      * @param topoId
      * @param content
      * @param approved
+     * @param createTime
      * @return
      */
     public String submitFlow(String flowId, FlowDataDTO flowDataDTO, String uid, String topoId, String content,
-        boolean approved, String operateResult, String remark) {
+        boolean approved, String operateResult, String remark, Long createTime) {
         String name = RequestLocalBean.getName();
         NodeSubmitReqDTO nodeSubmitReqDTO = new NodeSubmitReqDTO();
         nodeSubmitReqDTO.setFlowId(flowId);
@@ -86,7 +87,7 @@ public class FlowService {
         nodeSubmitReqDTO.setContent(content);
         nodeSubmitReqDTO.setOperateResult(operateResult);
         nodeSubmitReqDTO.setRemark(remark);
-        nodeSubmitReqDTO.setCreateTime(System.currentTimeMillis());
+        nodeSubmitReqDTO.setCreateTime(createTime);
         nodeSubmitReqDTO.setApproved(approved);
         nodeSubmitReqDTO.setOccLock(flowDataDTO.getOccLock() + 1);
         log.info("[submitFlow] nodeSubmitReqDTO={}", JSON.toJSONString(nodeSubmitReqDTO));

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

@@ -121,7 +121,7 @@ public class AutoSubmit extends IJobHandler {
             try {
                 String execNode = flowService.submitFlow(flowId.toString(), flowDataDTO, uid,
                     ChangeFlowEnum.CHANGE_FLOW_EXE.getTopoId(), JSON.toJSONString(content), true,
-                    FlowxOperationEnum.SUBMIT.getName(), "提交工单");
+                    FlowxOperationEnum.SUBMIT.getName(), "提交工单", changeRecord.getCreateTime());
                 // 更新工单数据
                 changeRecord.setFlowNode(execNode);
                 changeRecord.setUpdateTime(DateUtils.getCurrentTime());

yanxuan-qc-change-system-common/src/main/java/com/netease/mail/yanxuan/change/common/bean/ResponseCode.java

@@ -123,7 +123,6 @@ public enum ResponseCode {
     //----------10xx-----------
     CREATE_FLOW_ERROR(1001, "创建工单错误"),
     DETAIL_FLOW_ERROR(1002, "查询工单详情错误"),
-    SUBMIT_FLOW_ERROR(1002, "提交工单错误"),
     ERROR_FLOW_ID(1003, "工单id不存在"),
     NODE_ERROR(1004, "工单已流转至其他节点"),
     NO_AUTH(1005, "没有当前节点操作权限"),
@@ -132,6 +131,7 @@ public enum ResponseCode {
     OPERATOR_NOT_EXIST(1008, "操作人不存在"),
     CREATE_TODO_ERROR(1009, "传单待办错误"),
     COMMANDER_TYPE_NOT_EXIST(1010,"变更负责人类型错误"),
+    SUBMIT_FLOW_ERROR(1011, "提交工单错误"),
 
     /**
      * 无权限