diff --git a/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/api/feign/RemoteFlowApiFlowService.java b/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/api/feign/RemoteFlowApiFlowService.java index 5ce0bb7d6..bf97b7ddf 100644 --- a/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/api/feign/RemoteFlowApiFlowService.java +++ b/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/api/feign/RemoteFlowApiFlowService.java @@ -61,6 +61,15 @@ public interface RemoteFlowApiFlowService { @PostMapping("/process-instance/queryMineTask") R> queryMineTask(@RequestBody TaskQueryParamDto queryParamDto); + /** + * 查询当前用户的已任务 + * + * @param queryParamDto + * @return {@link R } 流程实例ID {@link String} + */ + @PostMapping("/process-instance/queryMineEndTask") + R> queryMineEndTask(@RequestBody TaskQueryParamDto queryParamDto); + /** * 获取流程数据 * @param businessKey 业务key diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/TaskController.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/TaskController.java new file mode 100644 index 000000000..d204270fd --- /dev/null +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/TaskController.java @@ -0,0 +1,77 @@ +package com.bsd.pjcloud.integrated.controller; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ArrayUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.bsd.pjcloud.common.core.util.R; +import com.bsd.pjcloud.common.excel.annotation.ResponseExcel; +import com.bsd.pjcloud.common.log.annotation.SysLog; +import com.bsd.pjcloud.common.security.util.SecurityUtils; +import com.bsd.pjcloud.flow.task.api.feign.RemoteFlowApiFlowService; +import com.bsd.pjcloud.flow.task.dto.TaskDto; +import com.bsd.pjcloud.flow.task.dto.TaskQueryParamDto; +import com.bsd.pjcloud.integrated.entity.NoticeEntity; +import com.bsd.pjcloud.integrated.service.NoticeService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.security.SecurityRequirement; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springdoc.core.annotations.ParameterObject; +import org.springframework.http.HttpHeaders; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 审批提醒,代办事项 + * + * @author zjf + * @date 2025-07-01 13:49:09 + */ +@RestController +@RequiredArgsConstructor +@RequestMapping("/task" ) +@Tag(description = "task" , name = "审批提醒,代办事项" ) +@SecurityRequirement(name = HttpHeaders.AUTHORIZATION) +public class TaskController { + + private final NoticeService noticeService; + + private final RemoteFlowApiFlowService remoteFlowApiFlowService; + + /** + * 我的待办 + * @param page 分页对象 + * @return + */ + @Operation(summary = "我的待办" , description = "我的待办" ) + @GetMapping("/process-instance/queryMineTask" ) + public R getMineTask(@ParameterObject Page page) { + TaskQueryParamDto taskQueryParamDto = new TaskQueryParamDto(); + taskQueryParamDto.setCurrent((int) page.getCurrent()); + taskQueryParamDto.setSize((int) page.getSize()); + R> pageR = remoteFlowApiFlowService.queryMineTask(taskQueryParamDto); + return pageR; + } + + + /** + * 我的已办 + * @param page 分页对象 + * @return + */ + @Operation(summary = "我的已办" , description = "我的已办" ) + @GetMapping("/process-instance/queryMineEndTask" ) + public R getMineEndTask(@ParameterObject Page page) { + TaskQueryParamDto taskQueryParamDto = new TaskQueryParamDto(); + taskQueryParamDto.setCurrent((int) page.getCurrent()); + taskQueryParamDto.setSize((int) page.getSize()); + R> pageR = remoteFlowApiFlowService.queryMineEndTask(taskQueryParamDto); + return pageR; + } + +} \ No newline at end of file