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/IMaintainService.java | 41 ++++++++++++++++-------------------------
1 files changed, 16 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/highdatas/mdm/service/IMaintainService.java b/src/main/java/com/highdatas/mdm/service/IMaintainService.java
index b189fb0..3e15c05 100644
--- a/src/main/java/com/highdatas/mdm/service/IMaintainService.java
+++ b/src/main/java/com/highdatas/mdm/service/IMaintainService.java
@@ -1,12 +1,13 @@
package com.highdatas.mdm.service;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.service.IService;
import com.highdatas.mdm.entity.Maintain;
+import com.highdatas.mdm.entity.TUser;
import com.highdatas.mdm.pojo.ActivitiStatus;
import com.highdatas.mdm.pojo.Operate;
import com.highdatas.mdm.pojo.Result;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -20,7 +21,7 @@
*/
public interface IMaintainService extends IService<Maintain> {
- HashMap<Operate, Object> compare(String maintainId, String maintainId2);
+ JSONObject compare(String maintainId, String maintainId2, Operate operate, int pageNo, int pageSize);
void dealFlow(String maintainId, ActivitiStatus status);
@@ -32,45 +33,35 @@
Maintain getInvalidMaxVersion(String tableName);
- Result getInvalidVerionData(String tableName, String where, Integer pageNo, Integer pageSize);
+ Long getInvalidVerionDataCnt(TUser user, String tableName, String where);
+
+ Result getInvalidVerionData(TUser user, String tableName, String where, Integer pageNo, Integer pageSize);
Maintain getNowVersion(String tableName);
-
- Maintain getRecentHistoryVersion(String tableName);
Maintain getMaintainFromVersion(String tableName, String verison);
- List<Map<String, Object>> selectVersionOperator(String tableTempName, String maintaInId, String where);
-
- List<Map<String, Object>> selectVersionOperator(String tableTempName, String maintaInId);
-
- List<Map<String, Object>> selectVersionOperatorByType(String tableTempName, String maintaInId, Operate operate, String where);
-
List<Map<String, Object>> selectVersionOperatorByType(String tableTempName, String maintaInId, Operate operate);
-
- long countVersionOperator(String tableTempName, String maintaInId, String whereSegment);
-
- long countVersionOperator(String tableTempName, String maintaInId);
-
long countVersionOperatorByType(String tableTempName, String filterSegment, String maintaInId, Operate operate);
- List<Map<String, Object>> selectVersionOperatorByPage(String tableTempName, String maintaInId, String limit, String where);
-
- List<Map<String, Object>> selectVersionOperatorByPage(String tableTempName, String maintaInId, String limit);
-
List<Map<String, Object>> selectVersionOperatorByTypeByPage(String tableTempName, String maintaInId, Operate operate,String limit);
-
-
- List<Map<String, Object>> selectVersionOperatorByTypeByPage(String tableTempName, String maintaInId, Operate operate, String limit, String where);
List<String> getCompareVersionMaintains(Maintain unFlowMaxVersion, Maintain maintainFromVersion);
- Result tempDataByVersionByFlow(String flowId, String whereSegment, Integer pageNo, Integer pageSize);
+ Result tempDataByVersionByFlow(TUser user, String flowId, String whereSegment, Integer pageNo, Integer pageSize);
boolean checkNowVersion(String id);
boolean checkFirstVersion(String id);
- Result getUnSubmitData(String tableName, Integer pageNo, String pageSize, String whereSegment);
+ Long getUnSubmitDataCnt(TUser user, String tableName, String whereSegment);
+
+ Result getUnSubmitData(TUser user, String tableName, Integer pageNo, String pageSize, String whereSegment);
+
+ Maintain getNextMaintain(String tableName, String userId);
+
+ JSONObject compareField(String maintainId1, String maintainId2);
+
+ Map<String, Object> getPreInfo(Maintain maintain, String id);
}
--
Gitblit v1.8.0