容缺接口

xiangpei

2025-03-06 7e7ac7b568d7b79a65c755bd47d0868835adc8f8

容缺接口

 business/src/main/java/com/ycl/controller/ProjectProcessController.java

@@ -95,6 +95,13 @@
        return projectProcessService.taskJump(form);
    }

    @PostMapping("/detail/task/wait")
    @ApiOperation(value = "容缺任务", notes = "容缺任务，不带表单数据的完成任务")
//    @PreAuthorize("@ss.hasPermi('projectProcess:detail')")
    public Result taskWait(@RequestBody TaskWaitForm form) {
        return projectProcessService.taskWait(form);
    }

    @GetMapping("/to_do_task")
    @ApiOperation(value = "分页", notes = "分页")
//    @PreAuthorize("@ss.hasPermi('projectProcess:page')")

 business/src/main/java/com/ycl/domain/form/TaskJumpForm.java

@@ -14,7 +14,7 @@
 * @date：2024/12/13 13:51
 */
@Data
@ApiModel("任务跳过/缺省表单")
@ApiModel("任务跳过表单")
public class TaskJumpForm {

    /**

 business/src/main/java/com/ycl/domain/form/TaskWaitForm.java

New file
@@ -0,0 +1,34 @@
package com.ycl.domain.form;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import javax.validation.constraints.NotBlank;

/**
 * 任务跳过/缺省
 *
 * @author：xp
 * @date：2024/12/13 13:51
 */
@Data
@ApiModel("任务容缺表单")
public class TaskWaitForm {

    /**
     * 当前任务id
     *
     */
    @NotBlank(message = "任务id不能为空")
    private String taskId;

    @ApiModelProperty("项目id，用于保存日志")
    private String projectId;

    @ApiModelProperty("流程实例id，用于保存日志")
    private String processInsId;

    @ApiModelProperty("说明")
    private String desc;
}

 business/src/main/java/com/ycl/domain/json/WaitData.java

New file
@@ -0,0 +1,22 @@
package com.ycl.domain.json;

import lombok.Data;

/**
 * 容缺任务
 *
 * @author：xp
 * @date：2025/2/12 13:43
 */
@Data
public class WaitData {


    /** 情况说明 */
    private String desc;


    public WaitData(String desc) {
        this.desc = desc;
    }
}

 business/src/main/java/com/ycl/service/ProjectProcessService.java

@@ -104,6 +104,14 @@
    Result taskJump(TaskJumpForm form);

    /**
     * 容缺任务
     *
     * @param form
     * @return
     */
    Result taskWait(TaskWaitForm form);

    /**
     * 督办任务
     *
     * @param form

 business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java

@@ -743,6 +743,35 @@
    }

    @Override
    public Result taskWait(TaskWaitForm form) {
        Task task = taskService.createTaskQuery().taskId(form.getTaskId()).processInstanceId(form.getProcessInsId()).singleResult();
        if (Objects.nonNull(task)) {
            // 添加容缺日志
            publisher.publishEvent(new TaskLogEvent(this,
                    null,
                    SecurityUtils.getUserId(),
                    form.getProjectId(),
                    form.getProcessInsId(),
                    task.getId(),
                    task.getTaskDefinitionKey(),
                    task.getName(),
                    ProcessLogEventTypeEnum.WAIT,
                    new WaitData(form.getDesc())));
            // 查出该任务绑定的表单
            Map<String, Object> data = new HashMap<>(1);
            if (StringUtils.isNotBlank(task.getFormKey())) {
                SysForm sysForm = formService.selectSysFormById(Long.parseLong(task.getFormKey()));
                if (Objects.nonNull(sysForm)) {
                    data.put(ProcessConstants.TASK_FORM_KEY, JSONObject.parseObject(sysForm.getFormContent()));
                }
            }
            // 完成任务
            flowTaskService.completeSubmitForm(form.getTaskId(), data, Boolean.FALSE);
        }
        return Result.ok("操作成功");
    }

    @Override
    public Result taskSupervise(TaskSuperviseForm form) {
        Task task = taskService.createTaskQuery().taskId(form.getTaskId()).singleResult();
        if (Objects.isNull(task)) {

 common/src/main/java/com/ycl/common/enums/business/ProcessLogEventTypeEnum.java

@@ -18,6 +18,7 @@
    REJECT("REJECT", "驳回"),
    TEAM_WORK("TEAM_WORK", "协同办理"),
    JUMP("JUMP", "跳过"),
    WAIT("WAIT", "容缺"),
    SUPERVISE("SUPERVISE", "督办"),
    HANGUP("HANGUP", "挂起"),
    CANCEL_HANGUP("CANCEL_HANGUP", "取消挂起"),