From 2cedb574c22cf2f77418929e79f23ace0a7e7ac6 Mon Sep 17 00:00:00 2001 From: 田源 <lastanimals@163.com> Date: 星期一, 29 四月 2024 10:05:12 +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 | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 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 ae7268c..efcf48b 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 @@ -1,9 +1,11 @@ package com.vci.ubcs.code.service; +import com.alibaba.nacos.shaded.com.google.protobuf.ServiceException; import com.baomidou.mybatisplus.core.metadata.IPage; import com.vci.ubcs.code.entity.*; import com.vci.ubcs.code.vo.pagemodel.*; import org.springblade.core.mp.support.Query; +import org.springblade.core.tool.api.R; import java.util.Map; @@ -11,12 +13,14 @@ * 绯荤当绠$悊鐩稿叧鏈嶅姟 */ public interface IDokingSysManaentService { + /** * data鍒楄〃 * @param condtionMap 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑 * @return 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭樉绀哄璞″垪琛� */ IPage<DockingTaskVO>gridDockingTask(Map<String,String> condtionMap, Query query); + /** * 寰呴泦鎴愭暟鎹� * @param condtionMap 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑 @@ -24,7 +28,13 @@ */ IPage<DockingDataVO>gridDockingData(Map<String,String> condtionMap, Query query); - + /** + * 鏍规嵁闆嗘垚鏃ュ織oid锛屾煡璇㈡棩蹇楄鎯� + * @param oid + * @return + * @throws ServiceException + */ + public DockingLogeVO getDockingLogDetailByOid(String oid) throws ServiceException; /** * 鎺ㄩ�佹暟鎹泦鎴愭棩蹇楀垪琛� @@ -39,7 +49,6 @@ * @return 闆嗘垚鏃ュ織鏄剧ず瀵硅薄鍒楄〃 */ IPage<DockingSysIntParamVO>gridParam(Map<String,String> condtionMap , Query query); - /** * 鎺ュ彛param鍒楄〃 -- Gitblit v1.9.3