工单创建

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

@@ -95,25 +95,17 @@ public class ChangeFlowBiz {
                 FlowxOperationEnum.CREATE.getName());
         // 创建工单
         String flowId = createFlow(flowCreateReqDTO);
+        // 查询工单详情
+        FlowDataDTO flowDataDTO = detailFlow(flowId);
+        String nodeId = flowDataDTO.getFlowMeta().getCurrNodeDataList().get(0).getNodeId();
         // 提交工单
-        String nodeId = submitFlow(flowId, flowCreateReqDTO);
+        // submitFlow(flowId, nodeId, flowCreateReqDTO);
         // 保存工单数据
         ChangeRecord changeRecord = buildRecord(flowId, nodeId, changeFlowCreateReq);
-        changeFlowService.saveRecord(changeRecord);
-        return null;
+        return changeFlowService.saveRecord(changeRecord);
     }
 
-    private FlowCreateReqDTO buildFlowCreateReqDTO(String topoId, String uid, String userName, String content, String operateResult) {
-        FlowCreateReqDTO flowCreateReqDTO = new FlowCreateReqDTO();
-        flowCreateReqDTO.setTopoId(topoId);
-        flowCreateReqDTO.setUid(uid);
-        flowCreateReqDTO.setUserName(userName);
-        flowCreateReqDTO.setOperateResult(operateResult);
-        flowCreateReqDTO.setWorkOrderId(StringUtils.joinWith("-", topoId, UUID.randomUUID().toString()));
-        return flowCreateReqDTO;
-    }
-
-    private String submitFlow(String flowId, FlowCreateReqDTO flowCreateReqDTO) {
+    private FlowDataDTO detailFlow(String flowId) {
         // 查询工单详情，根据详情提交
         FlowDataDTO flowDataDTO;
         AjaxResponse<FlowDataDTO> flowDetailResponse = flowRpcService.getDetail(CommonConstants.FLOWX_PRODUCT, flowId);
@@ -125,10 +117,23 @@ public class ChangeFlowBiz {
                     flowDetailResponse.getErrorMsg());
             throw ExceptionFactory.createBiz(ResponseCode.DETAIL_FLOW_ERROR, flowDetailResponse.getErrorMsg());
         }
+        return flowDataDTO;
+    }
 
+    private FlowCreateReqDTO buildFlowCreateReqDTO(String topoId, String uid, String userName, String content, String operateResult) {
+        FlowCreateReqDTO flowCreateReqDTO = new FlowCreateReqDTO();
+        flowCreateReqDTO.setTopoId(topoId);
+        flowCreateReqDTO.setUid(uid);
+        flowCreateReqDTO.setUserName(userName);
+        flowCreateReqDTO.setOperateResult(operateResult);
+        flowCreateReqDTO.setWorkOrderId(StringUtils.joinWith("-", topoId, UUID.randomUUID().toString()));
+        return flowCreateReqDTO;
+    }
+
+    private String submitFlow(String flowId, String nodeId, FlowCreateReqDTO flowCreateReqDTO) {
         NodeSubmitReqDTO nodeSubmitReqDTO = new NodeSubmitReqDTO();
         nodeSubmitReqDTO.setFlowId(flowId);
-        nodeSubmitReqDTO.setNodeId(flowDataDTO.getFlowMeta().getCurrNodeDataList().get(0).getNodeId());
+        nodeSubmitReqDTO.setNodeId(nodeId);
         nodeSubmitReqDTO.setUid(flowCreateReqDTO.getUid());
         nodeSubmitReqDTO.setUserName(flowCreateReqDTO.getUserName());
         nodeSubmitReqDTO.setFlowId(flowId);
@@ -140,7 +145,7 @@ public class ChangeFlowBiz {
         List<String> nextNodeIdList;
         // 提交工单
         AjaxResponse<List<String>> submitResponse = flowRpcService.submit(CommonConstants.FLOWX_PRODUCT, nodeSubmitReqDTO);
-        if (ResponseCodeEnum.SUCCESS.getCode() == flowDetailResponse.getCode()) {
+        if (ResponseCodeEnum.SUCCESS.getCode() == submitResponse.getCode()) {
             nextNodeIdList = submitResponse.getData();
             log.info("[createAndSubmitFlow] nextNodeIdList={}", JSON.toJSONString(nextNodeIdList));
         } else {

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

@@ -22,5 +22,5 @@ public interface ChangeFlowService {
      */
     TitleConfig getTitleConfig();
 
-    Integer saveRecord(ChangeRecord changeRecord);
+    Boolean saveRecord(ChangeRecord changeRecord);
 }
\ No newline at end of file

yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/service/impl/ChangeFlowServiceImpl.java

@@ -35,7 +35,7 @@ public class ChangeFlowServiceImpl implements ChangeFlowService {
     }
 
     @Override
-    public Integer saveRecord(ChangeRecord changeRecord) {
-        return changeRecordMapper.insertSelective(changeRecord);
+    public Boolean saveRecord(ChangeRecord changeRecord) {
+        return changeRecordMapper.insertSelective(changeRecord) > 0;
     }
 }
\ No newline at end of file