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/IMaintainFieldService.java | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/highdatas/mdm/service/IMaintainFieldService.java b/src/main/java/com/highdatas/mdm/service/IMaintainFieldService.java index 7fd1169..f865605 100644 --- a/src/main/java/com/highdatas/mdm/service/IMaintainFieldService.java +++ b/src/main/java/com/highdatas/mdm/service/IMaintainFieldService.java @@ -1,9 +1,9 @@ package com.highdatas.mdm.service; +import com.alibaba.fastjson.JSONArray; +import com.baomidou.mybatisplus.service.IService; import com.highdatas.mdm.entity.Maintain; import com.highdatas.mdm.entity.MaintainField; -import com.baomidou.mybatisplus.service.IService; -import com.highdatas.mdm.entity.SysField; import com.highdatas.mdm.pojo.ActivitiStatus; import java.util.List; @@ -20,12 +20,7 @@ MaintainField getNextMaintain(String tableName, String userId); - - - boolean checkNowVersion(String id); - boolean checkFirstVersion(String id); - - boolean checkdMaxVersion(String maintainId); + List<Maintain> getMaintainByMaintainField(String maintainFieldId, String tableName); MaintainField getMaxVersion(String tableName); @@ -33,9 +28,12 @@ MaintainField getNowVersion(String tableName); - MaintainField getMaintainFromVersion(String tableName, String verison); void dealFlow(String maintainId, ActivitiStatus status); int getUnFlowCount(String tableName, String userId); + + JSONArray getMaintainListByTable(String tableName); + + List<Maintain> getMaintainListByMaintainField(String id,String tableName); } -- Gitblit v1.8.0