From 8033eea1502d4cb0a91aa4b86c848ccb00ba8dc0 Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期五, 13 三月 2020 09:31:46 +0800
Subject: [PATCH] no message
---
src/main/java/com/highdatas/mdm/controller/MaintainController.java | 34 ++++++++++++++++++++++------------
1 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/highdatas/mdm/controller/MaintainController.java b/src/main/java/com/highdatas/mdm/controller/MaintainController.java
index 7d22c7f..295918f 100644
--- a/src/main/java/com/highdatas/mdm/controller/MaintainController.java
+++ b/src/main/java/com/highdatas/mdm/controller/MaintainController.java
@@ -28,7 +28,6 @@
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
-import java.util.stream.Collectors;
/**
* <p>
@@ -91,24 +90,35 @@
}
}
- @RequestMapping(value = "/history/{tableName}", method = RequestMethod.GET)
+ @RequestMapping(value = "/version/{tableName}", method = RequestMethod.GET)
public Result getHistory(@PathVariable String tableName) {
Maintain nowVersion = maintainService.getNowVersion(tableName);
if (nowVersion == null) {
return Result.error(new CodeMsg(100001,"鏃犲綋鍓嶇増鏈�"));
}
- List<Maintain> maintainList = maintainService.selectList(new EntityWrapper<Maintain>().eq("table_name", tableName).le("order_no",nowVersion.getOrderNo() - 1).orderBy("order_no",false));
+ List<Maintain> maintainList = maintainService.selectList(new EntityWrapper<Maintain>().eq("table_name", tableName).orderBy("order_no",false));
+ List<Maintain> result = new ArrayList<>();
+ for (Maintain maintain : maintainList) {
+ String flowId = maintain.getFlowId();
+ if (StringUtils.isEmpty(flowId)) {
+ continue;
+ }
- if (maintainList == null) {
- return Result.error(CodeMsg.SELECT_ERROR_NOTFOUND);
+ Flows flows = flowsService.selectById(maintain.getFlowId());
+ if (flows.getStatus().equals(ActivitiStatus.close)) {
+ continue;
+ }
+ if (flows.getStatus().equals(ActivitiStatus.working) || flows.getStatus().equals(ActivitiStatus.refuse)) {
+ maintain.setMaintainType(-1);
+ }else if(flows.getStatus().equals(ActivitiStatus.open)){
+ maintain.setMaintainType(1);
+ }
+ if (maintain.getId().equalsIgnoreCase(nowVersion.getId())) {
+ maintain.setMaintainType(0);
+ }
+ result.add(maintain);
}
-
- List<String> result = maintainList.stream()
- .filter(maintain -> !StringUtils.isEmpty(maintain.getFlowId()))
- .filter(maintain -> flowsService.selectById(maintain.getFlowId()).getStatus().equals(ActivitiStatus.open))
- .map(maintain -> maintain.getVersion())
- .collect(Collectors.toList());
return Result.success(result);
}
@@ -142,7 +152,7 @@
result = maintainService.selectPage(maintainPage);
} else {
Wrapper<Maintain> tableNameWrapper = new EntityWrapper<Maintain>().eq("table_name", tableName);
- tableNameWrapper.orderBy("version desc");
+ tableNameWrapper.orderBy("order_no desc");
result = maintainService.selectPage(maintainPage, tableNameWrapper);
}
List<Maintain> records = result.getRecords();
--
Gitblit v1.8.0