feat: 子工单分批流转逻辑处理

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

@@ -404,6 +404,7 @@ public class ChangeFlowBiz {
                     .changeExecUserEmail(execUserEmail)
                     .changeExecDepartment(execDepartment)
                     .changeCommander(changeRecord.getChangeCommander())
+                    .changeConfirmResultTime(changeRecord.getChangeConfirmResultTime())
                     .createTime(DateUtils.getCurrentTime())
                     .updateTime(DateUtils.getCurrentTime())
                     .build();

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

@@ -87,26 +87,26 @@ public class ChangeSubFlowBiz {
     private final SupplierSendService sendSupplierEmail;
 
 
-    public String createAndSubmit(@Valid ChangeSubFlowCreateReq changeSubFlowCreateReq) {
-        String uid = RequestLocalBean.getUid();
-        String name = RequestLocalBean.getName();
-        Map<String, Object> content = new HashMap<>(10);
-        content.put("createUserName", uid);
-        content.put("createUser", uid);
-        content.put("createTime", System.currentTimeMillis());
-        content.put("updateTime", System.currentTimeMillis());
-        content.put(CommonConstants.FLOW_OPERATION_KEY, FlowOperationTypeEnum.PASS.getValue());
-        String flowName = "";
-        // 组装工单创建数据
-        FlowCreateReqDTO flowCreateReqDTO = buildFlowCreateReqDTO(ChangeFlowEnum.CHANGE_SUB_FLOW.getTopoId(), uid,
-                JSON.toJSONString(content), FlowxOperationEnum.CREATE.getName(), name, flowName);
-        // 创建工单
-        String subFlowId = flowService.createFlow(flowCreateReqDTO);
-
-        ChangeExecRecord execRecord = new ChangeExecRecord();
-        changeSubFlowService.createSubFlow(execRecord);
-        return "";
-    }
+    //public String createAndSubmit(@Valid ChangeSubFlowCreateReq changeSubFlowCreateReq) {
+    //    String uid = RequestLocalBean.getUid();
+    //    String name = RequestLocalBean.getName();
+    //    Map<String, Object> content = new HashMap<>(10);
+    //    content.put("createUserName", uid);
+    //    content.put("createUser", uid);
+    //    content.put("createTime", System.currentTimeMillis());
+    //    content.put("updateTime", System.currentTimeMillis());
+    //    content.put(CommonConstants.FLOW_OPERATION_KEY, FlowOperationTypeEnum.PASS.getValue());
+    //    String flowName = "";
+    //    // 组装工单创建数据
+    //    FlowCreateReqDTO flowCreateReqDTO = buildFlowCreateReqDTO(ChangeFlowEnum.CHANGE_SUB_FLOW.getTopoId(), uid,
+    //            JSON.toJSONString(content), FlowxOperationEnum.CREATE.getName(), name, flowName);
+    //    // 创建工单
+    //    String subFlowId = flowService.createFlow(flowCreateReqDTO);
+    //
+    //    ChangeExecRecord execRecord = new ChangeExecRecord();
+    //    changeSubFlowService.createSubFlow(execRecord);
+    //    return "";
+    //}
 
     private FlowCreateReqDTO buildFlowCreateReqDTO(String topoId, String uid, String content, String operateResult,
                                                    String name, String flowName) {
@@ -463,21 +463,22 @@ public class ChangeSubFlowBiz {
      * 处理子单延期（DELAY）
      */
     private String handleSubFlowDelay(ChangeSubFlowRecord subFlowRecord, ChangeSubFlowSubmitReq req) {
-        // 1. 验证延期时间
+        // 验证延期时间
         Long changeConfirmResultTime = req.getChangeConfirmResultTime();
         Long tomorrowSpecificTime = DateUtils.getTomorrowSpecificTime("00:00:00");
         if (changeConfirmResultTime == null || changeConfirmResultTime < tomorrowSpecificTime) {
             throw ExceptionFactory.createBiz(ResponseCode.BAD_REQUEST, "时间不可晚于下次执行时间");
         }
         
-        // 2. 更新子单延期时间，不流转工单
+        // 更新子单延期时间，不流转工单
         subFlowRecord.setChangeConfirmResultTime(changeConfirmResultTime);
         subFlowRecord.setUpdateTime(DateUtils.getCurrentTime());
         changeSubFlowRecordService.update(subFlowRecord);
+
+        // todo:延期需要重新发邮件，改变执行邮件状态
         
         log.info("[handleSubFlowDelay] 子单延期，subFlowId:{}, delayTime:{}", subFlowRecord.getSubFlowId(), changeConfirmResultTime);
         
-        // 延期不流转工单，返回null
         return null;
     }
 

yanxuan-qc-change-system-web/src/main/java/com/netease/mail/yanxuan/change/web/controller/TestController.java

@@ -95,16 +95,6 @@ public class TestController {
     }
 
     /**
-     * 发起变更执行工单
-     *
-     * @return
-     */
-    @PostMapping("/create")
-    public AjaxResult<String> createAndSubmit(@RequestBody @Valid ChangeSubFlowCreateReq changeSubFlowCreateReq) {
-        return AjaxResult.success(changeSubFlowBiz.createAndSubmit(changeSubFlowCreateReq));
-    }
-
-    /**
      * 查询topo实际节点信息
      *
      * @param flowId 工单ID