From 55334da20cff4dac840c320eda1d0ca53ba27eda Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 23 九月 2024 14:26:36 +0800
Subject: [PATCH] Merge branch 'master-stander' into master-xlk

---
 src/main/java/com/hx/common/dao/CommonDao.java |   42 ++++++++++++++++++++++++++++++++++--------
 1 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/hx/common/dao/CommonDao.java b/src/main/java/com/hx/common/dao/CommonDao.java
index 44f7419..9333082 100644
--- a/src/main/java/com/hx/common/dao/CommonDao.java
+++ b/src/main/java/com/hx/common/dao/CommonDao.java
@@ -1,5 +1,4 @@
 package com.hx.common.dao;
-import com.hx.mybatisTool.SqlParam;
 import com.hx.mybatisTool.SqlSentence;
 
 import java.io.Serializable;
@@ -21,12 +20,26 @@
 	 */
 	<T extends Serializable>	int insert(Class<?> mapperClass, T entity);
 
+	/**鏂板锛岃繑鍥炰富閿�
+	 * @param mapperClass mapper绫�
+	 * @param entity 瀹炰綋绫�
+	 * @return 鏉℃暟
+	 */
+	<T extends Serializable>	int insertById(Class<?> mapperClass, T entity);
+
 	/**鏌ヨ鏉℃暟
 	 * @param mapperClass mapper绫�
-	 * @param sqlParam  鏌ヨ鍙傛暟绫�
+	 * @param sqlSentence  鏌ヨ鍙傛暟绫�
 	 * @return 杩斿洖鏉℃暟
 	 */
-	<T extends Serializable> int selectCount(Class<?> mapperClass, SqlParam sqlParam);
+	<T extends Serializable> int selectCount(Class<?> mapperClass, SqlSentence sqlSentence);
+
+	/**鏌ヨ鏉℃暟
+	 * @param mapperClass mapper绫�
+	 * @param sqlSentence  鏌ヨ鍙傛暟绫�
+	 * @return 杩斿洖鏉℃暟
+	 */
+	<T extends Serializable> int selectCountSql(Class<?> mapperClass, SqlSentence sqlSentence);
 
 	/**鏌ヨ鍒楄〃锛岃繑鍥炲疄浣撶被鐨凩ist
 	 * @param mapperClass mapper绫�
@@ -72,10 +85,10 @@
 
 	/**鏇存柊锛岃繑鍥炴洿鏂版暟閲�
 	 * @param mapperClass mapper绫�
-	 * @param sqlParam 鏌ヨ鍙傛暟绫�
+	 * @param sqlSentence 鏌ヨ鍙傛暟绫�
 	 * @return 杩斿洖鏉℃暟
 	 */
-	<T extends Serializable> int updateWhere(Class<?> mapperClass, SqlParam sqlParam);
+	<T extends Serializable> int updateWhere(Class<?> mapperClass, SqlSentence sqlSentence);
 
 	/**鏇存柊锛岃繑鍥炴洿鏂版暟閲�
 	 * @param mapperClass mapper绫�
@@ -86,10 +99,10 @@
 
 	/**鍒犻櫎锛岃繑鍥炲垹闄ゆ暟閲�
 	 * @param mapperClass mapper绫�
-	 * @param sqlParam 鏌ヨ鍙傛暟绫�
+	 * @param sqlSentence 鏌ヨ鍙傛暟绫�
 	 * @return 杩斿洖鏉℃暟
 	 */
-	<T extends Serializable> int deleteWhere(Class<?> mapperClass, SqlParam sqlParam);
+	<T extends Serializable> int deleteWhere(Class<?> mapperClass, SqlSentence sqlSentence);
 
 	/**鍒犻櫎锛岃繑鍥炲垹闄ゆ暟閲�
 	 * @param mapperClass mapper绫�
@@ -97,5 +110,18 @@
 	 * @return 杩斿洖鏉℃暟
 	 */
 	<T extends Serializable> int deleteById(Class<?> mapperClass, Object object);
-	
+
+	/**鏇存柊sql璇彞锛堝叏璇彞锛�
+	 * @param sqlSentence 鏌ヨ鍙傛暟绫�
+	 * @return 杩斿洖鏉℃暟
+	 */
+	<T extends Serializable> int updateSentence( SqlSentence sqlSentence);
+
+	/**鏌ヨ鏉℃暟璇彞锛堝叏璇彞锛�
+	 * @param sqlSentence 鏌ヨ鍙傛暟绫�
+	 * @return 杩斿洖鏉℃暟
+	 */
+	<T extends Serializable> int selectCountSql( SqlSentence sqlSentence);
+
+
 }
\ No newline at end of file

--
Gitblit v1.8.0