From c8aee7b9bfd79cfd741d7e5692520f4f51a31a86 Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期一, 18 五月 2020 18:30:01 +0800
Subject: [PATCH] bak 修改 获取版本数据前
---
src/main/java/com/highdatas/mdm/controller/FlowsController.java | 47 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 38 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/highdatas/mdm/controller/FlowsController.java b/src/main/java/com/highdatas/mdm/controller/FlowsController.java
index b5a82c9..4c63758 100644
--- a/src/main/java/com/highdatas/mdm/controller/FlowsController.java
+++ b/src/main/java/com/highdatas/mdm/controller/FlowsController.java
@@ -2,15 +2,18 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.highdatas.mdm.entity.Flows;
-import com.highdatas.mdm.entity.SysMenu;
+import com.highdatas.mdm.entity.TUser;
+import com.highdatas.mdm.pojo.ActivitiBusinessType;
import com.highdatas.mdm.pojo.ActivitiStatus;
import com.highdatas.mdm.pojo.CodeMsg;
import com.highdatas.mdm.pojo.Result;
import com.highdatas.mdm.service.IFlowsService;
-import com.highdatas.mdm.service.ITUserService;
-import com.sun.tools.javac.jvm.Code;
+import com.highdatas.mdm.util.DbUtils;
+import org.activiti.engine.RuntimeService;
+import org.activiti.engine.runtime.ProcessInstance;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable;
@@ -19,8 +22,8 @@
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
import java.util.List;
-import java.util.stream.Collectors;
/**
* <p>
@@ -35,8 +38,9 @@
public class FlowsController {
@Autowired
IFlowsService flowsService;
+
@Autowired
- ITUserService userService;
+ RuntimeService runtimeService;
@RequestMapping(value = "/{pageno}", method = RequestMethod.GET)
public Result<Page<Flows>> getAll(@PathVariable int pageno, HttpServletRequest request) {
String pageSize = request.getParameter("pageSize");
@@ -57,20 +61,46 @@
Page page = new Page(pageno, size);
Page<Flows> menuPage = flowsService.selectPage(page, flowsEntityWrapper);
List<Flows> records = menuPage.getRecords();
- List<Flows> recordsStr = records.stream().map(flows -> flows.setBusinessTypeStr(flows.getBusinessType().toString()).setUserName(userService.selectById(flows.getUserId()).getUserName())).collect(Collectors.toList());
+ List<Flows> recordsStr = new ArrayList<>();
+ for (Flows flows : records) {
+ flows.setBusinessTypeStr(flows.getBusinessType().toString());
+ TUser userById = DbUtils.getUserById(flows.getUserId());
+ flows.setUserName(userById.getUserName());
+ recordsStr.add(flows);
+ }
menuPage.setRecords(recordsStr);
return Result.success(menuPage);
}
+ @RequestMapping(value = "closeByUser/{userId}", method = RequestMethod.GET)
+ public Result closeByUser(@PathVariable String userId, HttpServletRequest request) {
+ Wrapper<Flows> user_id = new EntityWrapper<Flows>().eq("user_id", userId);
+ List<Flows> flows = flowsService.selectList(user_id);
+ for (Flows flow : flows) {
+ closeById(flow.getId());
+ }
+ return Result.success(null);
+ }
+
@RequestMapping(value = "close/{id}", method = RequestMethod.GET)
public Result close(@PathVariable String id, HttpServletRequest request) {
+ return closeById(id);
+ }
+
+ private Result closeById(@PathVariable String id) {
Flows flows = flowsService.selectById(id);
if (flows == null) {
return Result.error(CodeMsg.ERROR_PARAMS_NOT_MATHED);
}
+ String workflowId = flows.getWorkflowId();
+ ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(workflowId).singleResult();
+ if (processInstance != null) {
+ runtimeService.deleteProcessInstance(workflowId,"缁堟娴佺▼");
+ }
flows.setStatus(ActivitiStatus.close);
-
- flowsService.aduitFinish(flows);
+ if (!flows.getBusinessType().equals(ActivitiBusinessType.exists)) {
+ flowsService.aduitFinish(flows);
+ }
boolean update = flows.updateById();
if (update) {
@@ -78,6 +108,5 @@
}else {
return Result.error(CodeMsg.UPDATE_ERROR);
}
-
}
}
--
Gitblit v1.8.0