From 200f9e99bab7dcab9360f34fa25f6fa97c33c167 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 05 Mar 2024 14:59:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-ops/skjcmanager-flow/src/main/java/cn/gistack/flow/business/feign/FlowClient.java | 38 ++++++++++++++++++++++++++++++++++++--
1 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/skjcmanager/skjcmanager-ops/skjcmanager-flow/src/main/java/cn/gistack/flow/business/feign/FlowClient.java b/skjcmanager/skjcmanager-ops/skjcmanager-flow/src/main/java/cn/gistack/flow/business/feign/FlowClient.java
index 17edaa9..77e5861 100644
--- a/skjcmanager/skjcmanager-ops/skjcmanager-flow/src/main/java/cn/gistack/flow/business/feign/FlowClient.java
+++ b/skjcmanager/skjcmanager-ops/skjcmanager-flow/src/main/java/cn/gistack/flow/business/feign/FlowClient.java
@@ -20,6 +20,9 @@
import cn.gistack.flow.core.entity.BladeFlow;
import cn.gistack.flow.core.feign.IFlowClient;
import cn.gistack.flow.core.utils.TaskUtil;
+import cn.gistack.flow.core.vo.BladeFlowVO;
+import cn.gistack.flow.engine.service.FlowEngineService;
+import cn.gistack.sm.patrol.vo.BladeFlowPage;
import com.baomidou.mybatisplus.core.metadata.IPage;
import lombok.AllArgsConstructor;
import org.flowable.engine.IdentityService;
@@ -52,6 +55,7 @@
private final IdentityService identityService;
private final TaskService taskService;
private final FlowBusinessService flowBusinessService;
+ private final FlowEngineService flowEngineService;
@Override
@PostMapping(START_PROCESS_INSTANCE_BY_ID)
@@ -115,12 +119,42 @@
@Override
@PostMapping(TODO_LIST)
- public R<List<BladeFlow>> getTodoBladeFlowList(Integer size, Integer current, String currentUserId, BladeFlow bladeFlow) {
+ public R<BladeFlowPage> getTodoBladeFlowList(Integer size, Integer current, String currentUserId, BladeFlow bladeFlow) {
Query query = new Query();
query.setCurrent(current);
query.setSize(size);
IPage<BladeFlow> bladeFlowIPage = flowBusinessService.selectTodoPage(Condition.getPage(query), bladeFlow, currentUserId);
- return R.data(bladeFlowIPage.getRecords());
+
+ BladeFlowPage<BladeFlow> bladeFlowPage = new BladeFlowPage();
+ bladeFlowPage.setCurrent(bladeFlowIPage.getCurrent());
+ bladeFlowPage.setData(bladeFlowIPage.getRecords());
+ bladeFlowPage.setSize(bladeFlowIPage.getSize());
+ bladeFlowPage.setTotal(bladeFlowIPage.getTotal());
+ return R.data(bladeFlowPage);
+ }
+
+ @Override
+ @PostMapping(DONE_LIST)
+ public R<BladeFlowPage> getDoneBladeFlowList(Integer size, Integer current, String currentUserId, BladeFlowVO bladeFlow) {
+ Query query = new Query();
+ query.setCurrent(current);
+ query.setSize(size);
+ IPage<BladeFlowVO> bladeFlowIPage = flowBusinessService.selectDonePage(Condition.getPage(query), bladeFlow, currentUserId);
+
+ BladeFlowPage<BladeFlowVO> bladeFlowPage = new BladeFlowPage();
+ bladeFlowPage.setCurrent(bladeFlowIPage.getCurrent());
+ bladeFlowPage.setData(bladeFlowIPage.getRecords());
+ bladeFlowPage.setSize(bladeFlowIPage.getSize());
+ bladeFlowPage.setTotal(bladeFlowIPage.getTotal());
+
+ return R.data(bladeFlowPage);
+ }
+
+ @Override
+ @GetMapping(HISTORY_FLOW_LIST)
+ public R<List<BladeFlow>> historyFlowList(String processInstanceId, String startActivityId, String endActivityId) {
+ List<BladeFlow> bladeFlows = flowEngineService.historyFlowList(processInstanceId, startActivityId, endActivityId);
+ return R.data(bladeFlows);
}
--
Gitblit v1.9.3