From 8d8b9e4254231ff4dc8fc32c29608aeec47232d5 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 26 十二月 2022 17:38:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/hx/common/service/impl/CommonDaoImpl.java |   36 ++++++++++++++++++++++++++++--------
 1 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/hx/common/service/impl/CommonDaoImpl.java b/src/main/java/com/hx/common/service/impl/CommonDaoImpl.java
index 4bc281b..32fdd9a 100644
--- a/src/main/java/com/hx/common/service/impl/CommonDaoImpl.java
+++ b/src/main/java/com/hx/common/service/impl/CommonDaoImpl.java
@@ -1,7 +1,7 @@
 package com.hx.common.service.impl;
 
 import com.hx.common.dao.CommonDao;
-import com.hx.mybatisTool.SqlParam;
+import com.hx.common.dao.mapper.CommonMapper;
 import com.hx.mybatisTool.SqlSentence;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.springframework.stereotype.Service;
@@ -29,10 +29,18 @@
         return sqlSessionFactory.openSession().insert(getStatement(mapperClass,"insert"),entity);
     }
 
-    /**鑾峰彇鏉℃暟*/
+    /**鑾峰彇鏉℃暟
+     * @return*/
     @Override
-    public <T extends Serializable> int selectCount(Class<?> mapperClass,SqlParam sqlParam) {
-        return sqlSessionFactory.openSession().selectOne(getStatement(mapperClass,"selectCount"),sqlParam);
+    public <T extends Serializable> int selectCount(Class<?> mapperClass, SqlSentence sqlSentence) {
+        return sqlSessionFactory.openSession().selectOne(getStatement(mapperClass,"selectCount"),sqlSentence);
+    }
+
+    /**鑾峰彇鏉℃暟
+     * @return*/
+    @Override
+    public <T extends Serializable> int selectCountSql(Class<?> mapperClass, SqlSentence sqlSentence) {
+        return sqlSessionFactory.openSession().selectOne(getStatement(mapperClass,"selectCountSql"),sqlSentence);
     }
 
     /**鑾峰彇鍒楄〃*/
@@ -73,8 +81,8 @@
 
     /**鏇存柊*/
     @Override
-    public <T extends Serializable> int updateWhere(Class<?> mapperClass,SqlParam sqlParam) {
-        return sqlSessionFactory.openSession().update(getStatement(mapperClass,"updateWhere"),sqlParam);
+    public <T extends Serializable> int updateWhere(Class<?> mapperClass,SqlSentence sqlSentence) {
+        return sqlSessionFactory.openSession().update(getStatement(mapperClass,"updateWhere"),sqlSentence);
     }
 
     /**鍏ㄩ儴瀛楁鏇存柊*/
@@ -85,8 +93,8 @@
 
     /**鍒犻櫎*/
     @Override
-    public <T extends Serializable> int deleteWhere(Class<?> mapperClass,SqlParam sqlParam) {
-        return sqlSessionFactory.openSession().delete(getStatement(mapperClass,"deleteWhere"),sqlParam);
+    public <T extends Serializable> int deleteWhere(Class<?> mapperClass,SqlSentence sqlSentence) {
+        return sqlSessionFactory.openSession().delete(getStatement(mapperClass,"deleteWhere"),sqlSentence);
     }
 
     /**鍒犻櫎*/
@@ -95,4 +103,16 @@
         return sqlSessionFactory.openSession().delete(getStatement(mapperClass,"deleteById"),object);
     }
 
+    /**鏇存柊sql璇彞锛堝叏璇彞锛�*/
+    @Override
+    public <T extends Serializable> int updateSentence(SqlSentence sqlSentence) {
+        return sqlSessionFactory.openSession().update(getStatement(CommonMapper.class,"updateSentence"),sqlSentence);
+    }
+
+    /**鏌ヨ鏉℃暟锛堝叏璇彞锛�*/
+    @Override
+    public <T extends Serializable> int selectCountSql(SqlSentence sqlSentence) {
+        return sqlSessionFactory.openSession().selectOne(getStatement(CommonMapper.class,"selectCountSql"),sqlSentence);
+    }
+
 }

--
Gitblit v1.8.0