feat: 取消变更

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

@@ -835,8 +835,22 @@ public class ChangeFlowBiz {
         // 查询工单有效性
         ChangeRecord changeRecord = getFlowInfo(flowId);
         String currentNodeId = changeRecord.getFlowNode();
-        log.info("[cancel] nodeId:{}", currentNodeId);
+        log.info("[cancel] nodeId:{}, type:{}", currentNodeId, req.getType());
         
+        // 判断是取消还是终止（type 默认值为 CANCEL）
+        String operationType = req.getType();
+        boolean isTermination = "TERMINATION".equalsIgnoreCase(operationType);
+        
+        // 取消和终止都需要检查：节点不是9999（结束节点）且状态不是完结
+        Integer currentState = changeRecord.getState();
+        if (ChangeFlowEnum.NEW_END.getNodeId().equals(currentNodeId) 
+                || ChangeStatusEnum.FINISHED.getStatus().equals(currentState)) {
+            String errorMsg = isTermination ? "已完结的工单不能终止" : "已完结的工单不能取消";
+            throw ExceptionFactory.createBiz(ResponseCode.BAD_REQUEST, errorMsg);
+        }
+        
+        // 取消：检查允许的节点
+        if (!isTermination) {
             List<String> allowedCancelNodes = Arrays.asList(
                     ChangeFlowEnum.NEW_CHANGE_FLOW_START.getNodeId(),
                     ChangeFlowEnum.NEW_CHANGE_FLOW_OWNER_APPROVE.getNodeId(),
@@ -845,6 +859,10 @@ public class ChangeFlowBiz {
                     ChangeFlowEnum.NEW_CHANGE_FLOW_CONFIRM.getNodeId()
             );
             this.checkNode(currentNodeId, allowedCancelNodes);
+            log.info("[cancel] 取消变更，flowId:{}, nodeId:{}", flowId, currentNodeId);
+        } else {
+            log.info("[cancel] 终止变更，flowId:{}, nodeId:{}, state:{}", flowId, currentNodeId, currentState);
+        }
         
         String uid = RequestLocalBean.getUid();
         String changeCommander = changeRecord.getChangeCommander();
@@ -856,14 +874,15 @@ public class ChangeFlowBiz {
         if (flowDataDTO == null) {
             throw ExceptionFactory.createBiz(ResponseCode.DETAIL_FLOW_ERROR, "工单查询错误，不存在");
         }
-        // 工单流转：使用 paramMap 方式，type=2 表示回退
+        // 工单流转：使用 paramMap 方式，type=2 表示取消/终止
         Map<String, Object> content = buildFlowContent(FlowOperationTypeEnum.REFUSE);
         Map<String, Object> cancelParamMap = new HashMap<>();
         cancelParamMap.put("type", FlowTransitionType.TYPE_CANCEL);
+        String operationName = isTermination ? FlowxOperationEnum.TERMINATION.getName() : FlowxOperationEnum.CANCEL.getName();
         String nextNodeId = flowService.submitFlowWithParamMap(String.valueOf(flowId), flowDataDTO, uid,
                 ChangeFlowEnum.NEW_CHANGE_FLOW.getTopoId(), JSON.toJSONString(content), cancelParamMap,
-                FlowxOperationEnum.CANCEL.getName(), "取消变更", changeRecord.getCreateTime());
-        log.info("[cancel] flowId:{}, nextNodeId:{}", flowId, nextNodeId);
+                operationName, operationName, changeRecord.getCreateTime());
+        log.info("[cancel] flowId:{}, nextNodeId:{}, operationType:{}", flowId, nextNodeId, operationType);
         // 填充更新数据
         changeRecord.setFlowNode(nextNodeId);
         changeRecord.setState(ChangeStatusEnum.CANCEL.getStatus());

yanxuan-qc-change-system-common/src/main/java/com/netease/mail/yanxuan/change/common/enums/FlowxOperationEnum.java

@@ -35,7 +35,11 @@ public enum FlowxOperationEnum {
     /**
      * 取消变更
      */
-    CANCEL(8, "取消变更");
+    CANCEL(8, "取消变更"),
+    /**
+     * 终止变更
+     */
+    TERMINATION(9, "终止变更");
 
     /**
      * 类型

yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/meta/model/req/ChangeFlowCancelReq.java

@@ -28,4 +28,10 @@ public class ChangeFlowCancelReq {
     @NotBlank(message = "取消原因不能为空")
     @Size(max = 200, message = "取消原因限制200字")
     private String cancelReason;
+    
+    /**
+     * 操作类型：CANCEL-取消，TERMINATION-终止
+     * 默认值为 CANCEL，保持向后兼容
+     */
+    private String type = "CANCEL";
 }
\ No newline at end of file