add: 完成待办

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

@@ -192,20 +192,6 @@ public class ChangeFlowBiz {
         return flowId;
     }
 
-
-
-    /**
-     * 完成代办
-     * @param entity
-     */
-    public void finishSupplierTodoTask(ChangeRecord entity) {
-        String changeCommander = entity.getChangeCommander();
-        String flowId = String.valueOf(entity.getFlowId());
-        log.info("[finishSupplierTodoTask] taskFlowId={}, supplierId={}", flowId, changeCommander);
-        if (StringUtils.isNotEmpty(changeCommander)) {
-        }
-    }
-
     private List<ChangeFile> buildChangeFileRecord(Long changeRecordId, List<ChangeFlowFile> files) {
         return files.stream().map(f -> {
             ChangeFile changeFile = new ChangeFile();
@@ -498,8 +484,7 @@ public class ChangeFlowBiz {
                         changeRecord.setUpdateTime(DateUtils.getCurrentTime());
                         changeFlowService.updateRecord(changeRecord);
                         changeExecRecordList.forEach(exec->changeFlowExecService.update(exec));
-                        // todo: 完成代办
-                        finishSupplierTodoTask(changeRecord);
+                        todoService.finishTodoTask(changeRecord);
                         // todo:完结工单，发送邮件
                         return confirmNode;
                     case CANCEL:
@@ -513,7 +498,7 @@ public class ChangeFlowBiz {
                         changeRecord.setUpdateTime(DateUtils.getCurrentTime());
                         changeFlowService.updateRecord(changeRecord);
                         // todo: 完成代办
-                        finishSupplierTodoTask(changeRecord);
+                        todoService.finishTodoTask(changeRecord);
                         // todo:完结工单，发送邮件
                         return cancelNode;
                     case DELAY:
@@ -599,7 +584,7 @@ public class ChangeFlowBiz {
         changeRecord.setCancelReason(req.getCancelReason());
         changeRecord.setUpdateTime(DateUtils.getCurrentTime());
         // todo: 完成代办
-        finishSupplierTodoTask(changeRecord);
+        todoService.finishTodoTask(changeRecord);
         // todo:取消501节点，取消工单，发送邮件
         return changeFlowService.updateRecord(changeRecord);
     }

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

@@ -18,10 +18,12 @@ import com.netease.mail.yanxuan.change.biz.meta.exception.ExceptionFactory;
 import com.netease.mail.yanxuan.change.common.bean.CommonConstants;
 import com.netease.mail.yanxuan.change.common.bean.ResponseCode;
 import com.netease.mail.yanxuan.change.common.bean.ResponseCodeEnum;
-import com.netease.mail.yanxuan.change.common.enums.SupplierTodoTaskTypeEnum;
+import com.netease.mail.yanxuan.change.common.enums.OperateTypeEnum;
+import com.netease.mail.yanxuan.change.common.enums.TodoTaskTypeEnum;
 import com.netease.mail.yanxuan.change.dal.entity.ChangeRecord;
 import com.netease.mail.yanxuan.change.integration.todo.TaskCreateDTO;
 import com.netease.mail.yanxuan.change.integration.todo.TaskCreateParamVO;
+import com.netease.mail.yanxuan.change.integration.todo.TaskProcessParamVO;
 import com.netease.mail.yanxuan.change.integration.todo.TodoRpcService;
 import com.netease.yanxuan.flowx.sdk.meta.controller.communal.AjaxResponse;
 
@@ -44,6 +46,7 @@ public class TodoService {
      */
     public TaskCreateDTO createTodoTask(ChangeRecord entity) {
         String changeCommander = entity.getChangeCommander();
+        TaskCreateDTO taskCreateDTO = new TaskCreateDTO();
         if (StringUtils.isNotEmpty(changeCommander)) {
             String flowId = String.valueOf(entity.getFlowId());
             Map<String, Object> businessContent = new HashMap<>();
@@ -58,18 +61,39 @@ public class TodoService {
             taskCreateParamVO.setTaskHandler(changeCommander);
             taskCreateParamVO.setTaskHandlerName(changeCommander);
             taskCreateParamVO.setTaskTitle("测试");
-            taskCreateParamVO.setTaskTypeKey(SupplierTodoTaskTypeEnum.QC_CHANGE.getValue());
-            TaskCreateDTO taskCreateDTO;
+            taskCreateParamVO.setTaskTypeKey(TodoTaskTypeEnum.QC_CHANGE.getValue());
             AjaxResponse<TaskCreateDTO> taskCreateResponse = todoRpcService.create(taskCreateParamVO);
             if (ResponseCodeEnum.SUCCESS.getCode() == taskCreateResponse.getCode()) {
                 taskCreateDTO = taskCreateResponse.getData();
                 log.info("[createTodoTask] taskCreateDTO={}", JSON.toJSONString(taskCreateDTO));
-                return taskCreateDTO;
+
             } else {
                 log.error("[createTodoTask] create todo failed, param={}, errMsg={}", JSON.toJSONString(taskCreateParamVO),
                         JSON.toJSONString(taskCreateResponse));
                 throw ExceptionFactory.createBiz(ResponseCode.CREATE_TODO_ERROR, "查询工单详情错误");
             }
+
+        }
+        return taskCreateDTO;
+    }
+
+    /**
+     * 完成代办
+     * @param entity
+     */
+    public void finishTodoTask(ChangeRecord entity) {
+        String changeCommander = entity.getChangeCommander();
+        String flowId = String.valueOf(entity.getFlowId());
+        log.info("[finishSupplierTodoTask] taskFlowId={}, supplierId={}", flowId, changeCommander);
+        if (StringUtils.isNotEmpty(changeCommander)) {
+            TaskProcessParamVO taskProcessParamVO = new TaskProcessParamVO();
+            taskProcessParamVO.setBusinessKey(flowId);
+            taskProcessParamVO.setOperateType(OperateTypeEnum.FINISH.getType());
+            taskProcessParamVO.setOperator(changeCommander);
+            taskProcessParamVO.setOperatorName(changeCommander);
+            taskProcessParamVO.setProduct(CommonConstants.FLOWX_PRODUCT);
+            taskProcessParamVO.setTaskId(entity.getTodoId());
+            todoRpcService.progress(taskProcessParamVO);
         }
     }
 }
\ No newline at end of file

yanxuan-qc-change-system-common/src/main/java/com/netease/mail/yanxuan/change/common/enums/SupplierTodoTaskTypeEnum.java → yanxuan-qc-change-system-common/src/main/java/com/netease/mail/yanxuan/change/common/enums/TodoTaskTypeEnum.java

@@ -5,10 +5,10 @@ package com.netease.mail.yanxuan.change.common.enums;
  *
  * @author dmx
  */
-public enum SupplierTodoTaskTypeEnum {
+public enum TodoTaskTypeEnum {
     QC_CHANGE("101", "变更工单处理");
 
-    SupplierTodoTaskTypeEnum(String value, String desc) {
+    TodoTaskTypeEnum(String value, String desc) {
         this.value = value;
         this.desc = desc;
     }

yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/entity/ChangeRecord.java

@@ -165,7 +165,7 @@ public class ChangeRecord {
     /**
      * 待办id
      */
-    private Long todoId;
+    private Integer todoId;
 
     /**
      * 创建时间

yanxuan-qc-change-system-integration/src/main/java/com/netease/mail/yanxuan/change/integration/todo/TaskCreateDTO.java

@@ -20,7 +20,7 @@ public class TaskCreateDTO {
     /**
      * 待办id
      */
-    private Long id;
+    private Integer id;
     /**
      * 废弃
      */

yanxuan-qc-change-system-integration/src/main/java/com/netease/mail/yanxuan/change/integration/todo/TaskProcessParamVO.java

@@ -8,10 +8,13 @@ package com.netease.mail.yanxuan.change.integration.todo;
 
 import com.netease.mail.yanxuan.change.common.enums.OperateTypeEnum;
 
+import lombok.Data;
+
 /**
  * @Author zcwang
  * @Date 2022/11/28
  */
+@Data
 public class TaskProcessParamVO {
 
     /**

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

@@ -41,7 +41,7 @@ public class TestController {
     @PostMapping("/finishToDo")
     public AjaxResult<Void> finishTodoTask(ChangeRecord entity) {
         log.info("[createToDoTask] entity:{}", JSON.toJSONString(entity));
-        todoService.createTodoTask(entity);
+        todoService.finishTodoTask(entity);
         return AjaxResult.success();
     }
 }
\ No newline at end of file