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 | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/highdatas/mdm/controller/FlowsController.java b/src/main/java/com/highdatas/mdm/controller/FlowsController.java
index a948066..4c63758 100644
--- a/src/main/java/com/highdatas/mdm/controller/FlowsController.java
+++ b/src/main/java/com/highdatas/mdm/controller/FlowsController.java
@@ -2,9 +2,11 @@
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.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;
@@ -70,8 +72,22 @@
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);
@@ -82,8 +98,9 @@
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) {
@@ -91,6 +108,5 @@
}else {
return Result.error(CodeMsg.UPDATE_ERROR);
}
-
}
}
--
Gitblit v1.8.0