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-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/ILogOperateService.java |   23 +++++++++++++++++------
 1 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/ILogOperateService.java b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/ILogOperateService.java
index 6af6c3d..df90b74 100644
--- a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/ILogOperateService.java
+++ b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/ILogOperateService.java
@@ -1,9 +1,12 @@
 package com.vci.ubcs.log.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.vci.ubcs.log.entity.LogOperate;
 
-import java.util.List;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.vci.ubcs.starter.web.pagemodel.BladeQueryObject;
+import org.springblade.core.log.exception.ServiceException;
+import org.springblade.core.log.model.LogOperate;
+
 
 /**
  * 鎿嶄綔鏃ュ織绠＄悊:(鍖呮嫭鐧诲綍鏃ュ織銆佹搷浣滄棩蹇椼�佹巿鏉冩棩蹇楋紝浠ュ強绠＄悊鍛樼殑浠ヤ笂涓夌鏃ュ織)
@@ -17,13 +20,21 @@
 	 * @param logOperate
 	 * @return
 	 */
-	boolean saveLogOperate(LogOperate logOperate);
+	boolean saveLogOperate(LogOperate logOperate) throws ServiceException;
 
 	/**
 	 * 鏉′欢鏌ヨ鑾峰彇鏃ュ織鍒楄〃
-	 * @param logOperate
+	 * @param bladeQueryObject
 	 * @return
 	 */
-	List<LogOperate> listByCondition(LogOperate logOperate);
+	IPage<LogOperate> listByCondition(BladeQueryObject bladeQueryObject) throws ServiceException;
+
+	/**
+	 * 鏍规嵁oid鏌ヨ鏃ュ織璇︽儏
+	 * @param oid
+	 * @return
+	 * @throws ServiceException
+	 */
+	LogOperate detailByOid(String oid) throws ServiceException;
 
 }

--
Gitblit v1.9.3