From 586019ba7ccb6088ae8bc5f4bfa78cdede1e3e7e Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 12 May 2023 15:03:35 +0800
Subject: [PATCH] 巡检添加已办事务
---
skjcmanager/skjcmanager-ops/skjcmanager-flow/src/main/java/cn/gistack/flow/business/feign/FlowClient.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 49 insertions(+), 4 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 1960028..d264188 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
@@ -16,24 +16,28 @@
*/
package cn.gistack.flow.business.feign;
+import cn.gistack.flow.business.service.FlowBusinessService;
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.sm.patrol.vo.BladeFlowPage;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import lombok.AllArgsConstructor;
import org.flowable.engine.IdentityService;
import org.flowable.engine.RuntimeService;
import org.flowable.engine.TaskService;
import org.flowable.engine.runtime.ProcessInstance;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringUtil;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import java.util.List;
import java.util.Map;
/**
@@ -49,6 +53,7 @@
private final RuntimeService runtimeService;
private final IdentityService identityService;
private final TaskService taskService;
+ private final FlowBusinessService flowBusinessService;
@Override
@PostMapping(START_PROCESS_INSTANCE_BY_ID)
@@ -104,4 +109,44 @@
return R.data(taskService.getVariables(taskId));
}
+ @Override
+ @GetMapping(GET_BLADEFLOW)
+ public R<BladeFlow> getBladeFlow(String businessId,String currentUserId) {
+ return R.data(flowBusinessService.getBladeFlowByBusinessId(businessId,currentUserId));
+ }
+
+ @Override
+ @PostMapping(TODO_LIST)
+ 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);
+
+ 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);
+ }
+
+
}
--
Gitblit v1.9.3