fix:修复采购补货的taskId回显

pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/api/feign/RemoteFlowApiFlowService.java

@@ -1,11 +1,15 @@
 package com.bsd.pjcloud.flow.task.api.feign;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.bsd.pjcloud.common.core.constant.ServiceNameConstants;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.flow.task.dto.ProcessInstanceParamDto;
+import com.bsd.pjcloud.flow.task.dto.TaskDto;
+import com.bsd.pjcloud.flow.task.dto.TaskQueryParamDto;
 import com.bsd.pjcloud.flow.task.entity.Process;
 import com.bsd.pjcloud.flow.task.vo.FormGroupVo;
 import com.bsd.pjcloud.flow.task.vo.ProcessVO;
+import lombok.SneakyThrows;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -48,6 +52,14 @@ public interface RemoteFlowApiFlowService {
     @PostMapping("/process-instance/startProcessInstance")
     R<String> startProcessInstance(@RequestBody ProcessInstanceParamDto paramDto);
 
+    /**
+     * 查询当前用户的代办任务
+     *
+     * @param queryParamDto
+     * @return {@link R } 流程实例ID {@link String}
+     */
+    @PostMapping("/process-instance/queryMineTask")
+    R<Page<TaskDto>> queryMineTask(@RequestBody TaskQueryParamDto queryParamDto);
 
     /**
      * 获取流程数据

pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-biz/src/main/java/com/bsd/pjcloud/flow/task/controller/ProcessInstanceController.java

@@ -1,8 +1,10 @@
 package com.bsd.pjcloud.flow.task.controller;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.security.annotation.Inner;
 import com.bsd.pjcloud.flow.task.dto.ProcessInstanceParamDto;
+import com.bsd.pjcloud.flow.task.dto.TaskDto;
 import com.bsd.pjcloud.flow.task.dto.TaskQueryParamDto;
 import com.bsd.pjcloud.flow.task.service.IProcessInstanceService;
 import com.bsd.pjcloud.flow.task.vo.NodeFormatParamVo;
@@ -51,7 +53,7 @@ public class ProcessInstanceController {
 	 */
 	@SneakyThrows
 	@PostMapping("queryMineTask")
-	public R queryMineTask(@RequestBody TaskQueryParamDto queryParamDto) {
+	public R<Page<TaskDto>> queryMineTask(@RequestBody TaskQueryParamDto queryParamDto) {
 		return processInstanceService.queryMineTask(queryParamDto);
 	}
 

pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-biz/src/main/java/com/bsd/pjcloud/flow/task/service/IProcessInstanceService.java

@@ -1,7 +1,9 @@
 package com.bsd.pjcloud.flow.task.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.flow.task.dto.ProcessInstanceParamDto;
+import com.bsd.pjcloud.flow.task.dto.TaskDto;
 import com.bsd.pjcloud.flow.task.dto.TaskQueryParamDto;
 import com.bsd.pjcloud.flow.task.vo.NodeFormatParamVo;
 
@@ -22,7 +24,7 @@ public interface IProcessInstanceService {
 	 * @param taskQueryParamDto taskQueryParamDto
 	 * @return
 	 */
-	R queryMineTask(TaskQueryParamDto taskQueryParamDto);
+	R<Page<TaskDto>> queryMineTask(TaskQueryParamDto taskQueryParamDto);
 
 	/**
 	 * 查询已办任务

pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-biz/src/main/java/com/bsd/pjcloud/flow/task/service/impl/ProcessInstanceServiceImpl.java

@@ -91,7 +91,7 @@ public class ProcessInstanceServiceImpl implements IProcessInstanceService {
      * @return R
      */
     @Override
-    public R queryMineTask(TaskQueryParamDto taskQueryParamDto) {
+    public R<Page<TaskDto>> queryMineTask(TaskQueryParamDto taskQueryParamDto) {
         taskQueryParamDto.setAssign(SecurityUtils.getUser().getId().toString());
         R<Page<TaskDto>> r = flowEngineService.queryAssignTask(taskQueryParamDto);