任务统计bug

xiangpei

2025-03-26 1b9936ba920d65df09ab8dba79c6252568ee26e4

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

@@ -2,18 +2,22 @@

import com.ycl.common.group.Update;
import com.ycl.common.group.Add;
import com.ycl.domain.form.*;
import com.ycl.domain.query.TaskQuery;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import lombok.RequiredArgsConstructor;

import java.util.List;

import org.springframework.validation.annotation.Validated;

import javax.validation.constraints.NotEmpty;

import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import com.ycl.service.ProjectProcessService;
import com.ycl.common.base.Result;
import com.ycl.domain.form.ProjectProcessForm;
import com.ycl.domain.query.ProjectProcessQuery;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -36,7 +40,7 @@
    @PostMapping("/page")
    @ApiOperation(value = "分页", notes = "分页")
//    @PreAuthorize("@ss.hasPermi('projectProcess:page')")
    public Result page(ProjectProcessQuery query) {
    public Result page(@RequestBody ProjectProcessQuery query) {
        return projectProcessService.page(query);
    }

@@ -49,18 +53,18 @@
    }


    @GetMapping("/detail/{projectId}/{processId}")
    @PostMapping("/detail")
    @ApiOperation(value = "获取项目流程详情信息", notes = "获取项目流程详情信息")
//    @PreAuthorize("@ss.hasPermi('projectProcess:detail')")
    public Result detail(@PathVariable("projectId") Long projectId, @PathVariable("processId") String processId) {
        return projectProcessService.detail(projectId, processId);
    public Result detail(@RequestBody ProjectProcessForm form) {
        return projectProcessService.detail(form);
    }

    @PostMapping("/start/{projectId}/{processDefId}")
    @PostMapping("/start")
    @ApiOperation(value = "启动流程", notes = "启动流程")
//    @PreAuthorize("@ss.hasPermi('projectProcess:start')")
    public Result startProcess(@PathVariable("projectId") Long projectId, @PathVariable("processDefId") String processDefId) {
        return projectProcessService.startProcess(projectId, processDefId);
    public Result startProcess(@RequestBody @Validated ProjectProcessForm form) {
        return projectProcessService.startProcess(form);
    }

    @GetMapping("/detail/task/list")
@@ -69,4 +73,87 @@
    public Result taskList(TaskQuery query) {
        return projectProcessService.taskList(query);
    }

    @GetMapping("/detail/task/is/auditing")
    @ApiOperation(value = "获取任务是否是审批节点", notes = "获取任务是否是审批节点")
//    @PreAuthorize("@ss.hasPermi('projectProcess:detail')")
    public Result taskIsAuditing(String processDefId, String taskId) {
        return projectProcessService.taskIsAuditing(processDefId, taskId);
    }

    @PostMapping("/detail/task/delegation")
    @ApiOperation(value = "转办", notes = "将任务委托给其它人办理")
//    @PreAuthorize("@ss.hasPermi('projectProcess:detail')")
    public Result taskDelegation(@RequestBody TaskDelegationForm form) {
        return projectProcessService.taskDelegation(form);
    }

    @PostMapping("/detail/task/jump")
    @ApiOperation(value = "跳过任务", notes = "跳过任务，不带表单数据的完成任务")
//    @PreAuthorize("@ss.hasPermi('projectProcess:detail')")
    public Result taskJump(@RequestBody TaskJumpForm form) {
        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')")
    public Result getAllTodoTask(ProjectProcessQuery query) {

        Result result = Result.ok();
        projectProcessService.getIndexTodoTask("", (int) query.getPageSize(), (int) query.getCurrentPage(), result);
        return result;
    }

    @GetMapping("/wait_task")
    @ApiOperation(value = "分页", notes = "分页")
//    @PreAuthorize("@ss.hasPermi('projectProcess:page')")
    public Result getWaitTask(ProjectProcessQuery query) {
        Result result = Result.ok();
        projectProcessService.getIndexWaitTask("", (int) query.getPageSize(), (int) query.getCurrentPage(), result);
        return result;
    }

    @GetMapping("/detail-by-process_ins_id")
    @ApiOperation(value = "获取详情", notes = "获取详情")
//    @PreAuthorize("@ss.hasPermi('projectProcess:detail')")
    public Result detailByProcessInsId(TaskQuery query) {
        return projectProcessService.detailByProcessInsId(query);
    }


    @PostMapping("/detail/task/supervise")
    @ApiOperation(value = "督办", notes = "督办")
//    @PreAuthorize("@ss.hasPermi('projectProcess:detail')")
    public Result taskSupervise(@Validated @RequestBody TaskSuperviseForm form) {
        return projectProcessService.taskSupervise(form);
    }

    @PostMapping("/detail/task/teamwork")
    @ApiOperation(value = "发起协同办理", notes = "发起协同办理")
//    @PreAuthorize("@ss.hasPermi('projectProcess:detail')")
    public Result taskTeamwork(@Validated @RequestBody TaskTeamWorkForm form) {
        return projectProcessService.taskTeamwork(form);
    }

    @PostMapping("/detail/task/hangup")
    @ApiOperation(value = "挂起任务", notes = "挂起任务")
//    @PreAuthorize("@ss.hasPermi('projectProcess:detail')")
    public Result taskHangup(@Validated @RequestBody TaskHangupForm form) {
        return projectProcessService.taskHangup(form);
    }

    @PostMapping("/detail/task/hangup/cancel")
    @ApiOperation(value = "取消挂起任务", notes = "取消挂起任务")
//    @PreAuthorize("@ss.hasPermi('projectProcess:detail')")
    public Result cancelTaskHangup(@Validated @RequestBody TaskHangupForm form) {
        return projectProcessService.cancelTaskHangup(form);
    }
}