From 82fbbf24939e150ee3cef90dc0dd843c9897a7e6 Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期六, 23 五月 2020 12:27:13 +0800
Subject: [PATCH] 添加 log前 去除bak文件前的备份
---
src/main/java/com/highdatas/mdm/service/impl/MaintainServiceImpl.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/highdatas/mdm/service/impl/MaintainServiceImpl.java b/src/main/java/com/highdatas/mdm/service/impl/MaintainServiceImpl.java
index 42c941c..d8ef55a 100644
--- a/src/main/java/com/highdatas/mdm/service/impl/MaintainServiceImpl.java
+++ b/src/main/java/com/highdatas/mdm/service/impl/MaintainServiceImpl.java
@@ -142,7 +142,7 @@
return;
}
String fields = masterDataService.getTempFields(null, tableName);
- String tempFields = masterDataService.getFields(tableName + Constant.RECORD);
+ String tempFields = masterDataService.getFields(tableName + Constant.RECORD, Constant.T);
String tableTempName = tableName + Constant.RECORD;
// insert 2 std
@@ -632,6 +632,20 @@
return result;
}
+ @Override
+ public boolean getCanAct(String tableName) {
+ List<Maintain> maintainList = selectList(new EntityWrapper<Maintain>().eq("table_name", tableName));
+
+ long count = maintainList.stream()
+ .filter(one -> one.getFlowId() != null)
+ .filter(one -> flowsService.getStatusByBusinessId(one.getId()).equals(ActivitiStatus.working)).count();
+ if (count == 0) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+
private void getVerionMatintains(Maintain firstVersion, Maintain secondVersion, List<String> ids) {
Integer fromNo = firstVersion.getOrderNo();
--
Gitblit v1.8.0