From df18b23b4569828d6be32fb64c80492241e1fc46 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期一, 16 十月 2023 20:31:43 +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 | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 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..ae7268c 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,45 +5,47 @@ 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鍒楄〃 - * @param dockingSysIntParam 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑 + * @param condtionMap 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑 * @return 闆嗘垚鏃ュ織鏄剧ず瀵硅薄鍒楄〃 */ - IPage<DockingSysIntParamVO>gridParam(DockingSysIntParam dockingSysIntParam, Query query); + IPage<DockingSysIntParamVO>gridParam(Map<String,String> condtionMap , Query query); /** * 鎺ュ彛param鍒楄〃 - * @param dockingSysIntHeader 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑 + * @param condtionMap 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑 * @return 闆嗘垚鏃ュ織鏄剧ず瀵硅薄鍒楄〃 */ - IPage<DockingSysIntHeaderVO>gridHeader(DockingSysIntHeader dockingSysIntHeader, Query query); + IPage<DockingSysIntHeaderVO>gridHeader(Map<String,String> condtionMap , Query query); } -- Gitblit v1.9.3