From d370c5b1f2c33f8599db7ece89b484613b594f60 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期五, 15 九月 2023 08:48:09 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDokingSysManaentService.java | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDokingSysManaentService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDokingSysManaentService.java index aed6f9d..4441d42 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDokingSysManaentService.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDokingSysManaentService.java @@ -5,31 +5,33 @@ import com.vci.ubcs.code.vo.pagemodel.*; import org.springblade.core.mp.support.Query; +import java.util.Map; + /*** * 绯荤当绠$悊鐩稿叧鏈嶅姟 */ public interface IDokingSysManaentService { /** * data鍒楄〃 - * @param dockingTask 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑 + * @param condtionMap 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑 * @return 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭樉绀哄璞″垪琛� */ - IPage<DockingTaskVO>gridDockingTask(DockingTask dockingTask, Query query); + IPage<DockingTaskVO>gridDockingTask(Map<String,String> condtionMap, Query query); /** * 寰呴泦鎴愭暟鎹� - * @param dockingData 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑 + * @param condtionMap 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑 * @return 绯荤粺闆嗘垚鍩虹淇℃伅鏄剧ず瀵硅薄鍒楄〃 */ - IPage<DockingDataVO>gridDockingData(DockingData dockingData, Query query); + IPage<DockingDataVO>gridDockingData(Map<String,String> condtionMap, Query query); /** * 鎺ㄩ�佹暟鎹泦鎴愭棩蹇楀垪琛� - * @param dockingLog 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑 + * @param condtionMap 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑 * @return 闆嗘垚鏃ュ織鏄剧ず瀵硅薄鍒楄〃 */ - IPage<DockingLogeVO>gridLoge(DockingLog dockingLog, Query query); + IPage<DockingLogeVO>gridLoge(Map<String,String> condtionMap, Query query); /** * 鎺ュ彛param鍒楄〃 -- Gitblit v1.9.3