From c007f0ca1785db093d48f4846cda82fe8e955765 Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期三, 27 五月 2020 09:59:29 +0800
Subject: [PATCH] merage
---
src/main/java/com/highdatas/mdm/service/impl/MaintainServiceImpl.java | 83 -----------------------------------------
1 files changed, 1 insertions(+), 82 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 d8ef55a..4a6ddd4 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, Constant.T);
+ String tempFields = masterDataService.getFields(tableName + Constant.RECORD);
String tableTempName = tableName + Constant.RECORD;
// insert 2 std
@@ -450,36 +450,6 @@
//return selectOne(new EntityWrapper<Maintain>().eq("table_name", tableName).orderBy("version desc"));
}
- @Override
- public Maintain getRecentHistoryVersion(String tableName) {
- Maintain nowMaintain = null;
- Wrapper<Maintain> versionWrapper = new EntityWrapper<Maintain>().eq("table_name", tableName).isNotNull("flow_id").orderBy("order_no desc");
- List<Maintain> maintains = selectList(versionWrapper);
- for (Maintain maintain : maintains) {
- Flows flows = flowsService.selectById(maintain.getFlowId());
- if (flows == null) {
- continue;
- }
- ActivitiStatus status = flows.getStatus();
- if (status.equals(ActivitiStatus.open) && nowMaintain == null) {
- nowMaintain = maintain;
- continue;
- }
- if (!status.equals(ActivitiStatus.open) && nowMaintain != null) {
- nowMaintain = null;
- }
- }
- if (nowMaintain == null) {
- nowMaintain = selectOne(new EntityWrapper<Maintain>().eq("table_name", tableName).orderBy("order_no desc"));
- }
- int orderNo = nowMaintain.getOrderNo();
- Maintain nowVersion = getNowVersion(tableName);
- if (nowVersion != null && nowVersion.getOrderNo() == orderNo) {
- orderNo--;
- }
- Maintain maintain = selectOne(new EntityWrapper<Maintain>().eq("table_name", nowMaintain.getTableName()).eq("order_no", orderNo));
- return maintain;
- }
@Override
public Maintain getMaintainFromVersion(String tableName, String verison) {
@@ -488,34 +458,10 @@
return maxVersion;
}
- @Override
- public List<Map<String, Object>> selectVersionOperator(String tableTempName, String maintaInId, String where) {
- return maintainMapper.selectVersionOperator(tableTempName, where, maintaInId);
- }
-
- @Override
- public List<Map<String, Object>> selectVersionOperator(String tableTempName, String maintaInId) {
- return maintainMapper.selectVersionOperator(tableTempName, Constant.WHERE_DEFAULT, maintaInId);
- }
-
- @Override
- public List<Map<String, Object>> selectVersionOperatorByType(String tableTempName, String maintaInId, Operate operate, String where) {
- return maintainMapper.selectVersionOperatorByType(tableTempName, where, maintaInId, operate.name());
- }
@Override
public List<Map<String, Object>> selectVersionOperatorByType(String tableTempName, String maintaInId, Operate operate) {
return maintainMapper.selectVersionOperatorByType(tableTempName, Constant.WHERE_DEFAULT, maintaInId, operate.name());
- }
-
- @Override
- public long countVersionOperator(String tableTempName, String maintaInId, String whereSegment) {
- return maintainMapper.countVersionOperator(tableTempName, maintaInId, whereSegment);
- }
-
- @Override
- public long countVersionOperator(String tableTempName, String maintaInId) {
- return maintainMapper.countVersionOperator(tableTempName, maintaInId, Constant.WHERE_DEFAULT);
}
@@ -524,25 +470,12 @@
return maintainMapper.countVersionOperatorByType(tableTempName, filterSegment, maintaInId, operate.name());
}
- @Override
- public List<Map<String, Object>> selectVersionOperatorByPage(String tableTempName, String maintaInId, String limit, String where) {
- return maintainMapper.selectVersionOperatorByPage(tableTempName, maintaInId, limit, where);
- }
-
- @Override
- public List<Map<String, Object>> selectVersionOperatorByPage(String tableTempName, String maintaInId, String limit) {
- return maintainMapper.selectVersionOperatorByPage(tableTempName, Constant.WHERE_DEFAULT, maintaInId, limit);
- }
@Override
public List<Map<String, Object>> selectVersionOperatorByTypeByPage(String tableTempName, String maintaInId, Operate operate, String limit) {
return maintainMapper.selectVersionOperatorByTypeByPage(tableTempName, Constant.WHERE_DEFAULT, maintaInId, operate.name(), limit);
}
- @Override
- public List<Map<String, Object>> selectVersionOperatorByTypeByPage(String tableTempName, String maintaInId, Operate operate, String limit, String where) {
- return maintainMapper.selectVersionOperatorByTypeByPage(tableTempName, where, maintaInId, operate.name(), limit);
- }
@Override
public List<String> getCompareVersionMaintains(Maintain unFlowMaxVersion, Maintain maintainFromVersion) {
@@ -630,20 +563,6 @@
}
}
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;
- }
}
--
Gitblit v1.8.0