Commit e43039b0c69e5dbf2d83442c26613848086e21b7
1 parent
2607f13a
待办列表
Showing
3 changed files
with
14 additions
and
2 deletions
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/task/BpmProcessInstanceController.java
| @@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RestController; | @@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RestController; | ||
| 14 | import javax.annotation.Resource; | 14 | import javax.annotation.Resource; |
| 15 | import javax.validation.Valid; | 15 | import javax.validation.Valid; |
| 16 | 16 | ||
| 17 | -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | ||
| 18 | import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; | 17 | import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; |
| 19 | 18 | ||
| 20 | @Api(tags = "流程实例") // 流程实例,通过流程定义创建的一次“申请” | 19 | @Api(tags = "流程实例") // 流程实例,通过流程定义创建的一次“申请” |
| @@ -29,7 +28,9 @@ public class BpmProcessInstanceController { | @@ -29,7 +28,9 @@ public class BpmProcessInstanceController { | ||
| 29 | @PostMapping("/create") | 28 | @PostMapping("/create") |
| 30 | @ApiOperation("新建流程实例") | 29 | @ApiOperation("新建流程实例") |
| 31 | public CommonResult<String> createProcessInstance(@Valid @RequestBody BpmProcessInstanceCreateReqVO createReqVO) { | 30 | public CommonResult<String> createProcessInstance(@Valid @RequestBody BpmProcessInstanceCreateReqVO createReqVO) { |
| 32 | - return success(processInstanceService.createProcessInstance(getLoginUserId(), createReqVO)); | 31 | +// return success(processInstanceService.createProcessInstance(getLoginUserId(), createReqVO)); |
| 32 | + processInstanceService.getMyProcessInstancePage(getLoginUserId()); | ||
| 33 | + return null; | ||
| 33 | } | 34 | } |
| 34 | 35 | ||
| 35 | } | 36 | } |
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/task/BpmProcessInstanceService.java
| @@ -20,4 +20,6 @@ public interface BpmProcessInstanceService { | @@ -20,4 +20,6 @@ public interface BpmProcessInstanceService { | ||
| 20 | */ | 20 | */ |
| 21 | String createProcessInstance(Long userId, @Valid BpmProcessInstanceCreateReqVO createReqVO); | 21 | String createProcessInstance(Long userId, @Valid BpmProcessInstanceCreateReqVO createReqVO); |
| 22 | 22 | ||
| 23 | + void getMyProcessInstancePage(Long userId); | ||
| 24 | + | ||
| 23 | } | 25 | } |
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/task/impl/BpmProcessInstanceServiceImpl.java
| @@ -11,6 +11,7 @@ import org.activiti.engine.HistoryService; | @@ -11,6 +11,7 @@ import org.activiti.engine.HistoryService; | ||
| 11 | import org.activiti.engine.RepositoryService; | 11 | import org.activiti.engine.RepositoryService; |
| 12 | import org.activiti.engine.RuntimeService; | 12 | import org.activiti.engine.RuntimeService; |
| 13 | import org.activiti.engine.TaskService; | 13 | import org.activiti.engine.TaskService; |
| 14 | +import org.activiti.engine.history.HistoricProcessInstance; | ||
| 14 | import org.activiti.engine.history.HistoricProcessInstanceQuery; | 15 | import org.activiti.engine.history.HistoricProcessInstanceQuery; |
| 15 | import org.activiti.engine.impl.identity.Authentication; | 16 | import org.activiti.engine.impl.identity.Authentication; |
| 16 | import org.activiti.engine.repository.ProcessDefinition; | 17 | import org.activiti.engine.repository.ProcessDefinition; |
| @@ -20,6 +21,7 @@ import org.springframework.stereotype.Service; | @@ -20,6 +21,7 @@ import org.springframework.stereotype.Service; | ||
| 20 | import org.springframework.validation.annotation.Validated; | 21 | import org.springframework.validation.annotation.Validated; |
| 21 | 22 | ||
| 22 | import javax.annotation.Resource; | 23 | import javax.annotation.Resource; |
| 24 | +import java.util.List; | ||
| 23 | import java.util.Map; | 25 | import java.util.Map; |
| 24 | 26 | ||
| 25 | import static cn.iocoder.yudao.adminserver.modules.bpm.enums.BpmErrorCodeConstants.PROCESS_DEFINITION_IS_SUSPENDED; | 27 | import static cn.iocoder.yudao.adminserver.modules.bpm.enums.BpmErrorCodeConstants.PROCESS_DEFINITION_IS_SUSPENDED; |
| @@ -92,9 +94,16 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService | @@ -92,9 +94,16 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService | ||
| 92 | } | 94 | } |
| 93 | 95 | ||
| 94 | public void getMyProcessInstancePage(Long userId) { | 96 | public void getMyProcessInstancePage(Long userId) { |
| 97 | + // id title 所属流程 当前审批环节 状态 结果 创建时间 提交申请时间 【标题、状态】「ActBusiness」 | ||
| 98 | + // id title 流程类别 流程版本 提交时间 流程状态 耗时 当前节点 办理 【标题、提交时间】「HistoricProcessInstanceQuery」 | ||
| 99 | + | ||
| 100 | + runtimeService.createProcessInstanceQuery().list(); | ||
| 95 | HistoricProcessInstanceQuery historicProcessInstanceQuery = historyService.createHistoricProcessInstanceQuery() | 101 | HistoricProcessInstanceQuery historicProcessInstanceQuery = historyService.createHistoricProcessInstanceQuery() |
| 96 | .startedBy(String.valueOf(userId)) // 发起人是自己 | 102 | .startedBy(String.valueOf(userId)) // 发起人是自己 |
| 97 | .orderByProcessInstanceStartTime().desc(); // 按照发起时间倒序 | 103 | .orderByProcessInstanceStartTime().desc(); // 按照发起时间倒序 |
| 104 | + List<HistoricProcessInstance> list = historicProcessInstanceQuery.list(); | ||
| 105 | + System.out.println("test"); | ||
| 106 | + | ||
| 98 | } | 107 | } |
| 99 | 108 | ||
| 100 | } | 109 | } |