From a60332d51fec0ae9f1afecc8c7a018c77e4ac101 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期二, 27 二月 2024 10:03:29 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

---
 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockSv.java |   22 +++++++++++++++++++---
 1 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockSv.java
index ccd5632..89f37a1 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockSv.java
@@ -7,8 +7,10 @@
 import org.apache.dubbo.common.utils.PojoUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import java.util.Map;
+import org.springframework.transaction.annotation.Transactional;
+
 import java.util.List;
+import java.util.Map;
 
 @Slf4j
 @Service
@@ -30,6 +32,16 @@
         return this.dao.selectByPrimaryKey(id) ;
     }
 
+
+    /**
+     * 寰楀埌鎵�鏈夌墖鍖�
+     * @return 鎵�鏈夌墖鍖洪泦鍚�
+     */
+    public QueryResultVo<List<BaBlock>> selectAll(){
+        QueryResultVo<List<BaBlock>> rsVo = new QueryResultVo<>() ;
+        rsVo.obj = this.dao.selectAll() ;
+        return rsVo ;
+    }    
     /**
      * 寰楀埌涓�涓墖鍖�
      * @param vo 鏌ヨ鏉′欢鍊煎璞�
@@ -44,8 +56,9 @@
         rsVo.pageSize = vo.pageSize ;
         rsVo.pageCurr = vo.pageCurr ;
         rsVo.calculateAndSet(itemTotal, params);
+        rsVo.obj = this.dao.selectSome(params) ;
 
-        return (QueryResultVo.<List<BaBlock>>builder().content(this.dao.selectSome(params))).build() ;
+        return rsVo ;
     }
 
     /**
@@ -53,8 +66,9 @@
      * @param po 瀹炰綋
      * @return 鏁伴噺
      */
+    @Transactional
     public int save(BaBlock po){
-        return this.dao.insert(po) ;
+        return this.dao.putin(po) ;
     }
 
     /**
@@ -62,6 +76,7 @@
      * @param po 瀹炰綋
      * @return 鏁伴噺
      */
+    @Transactional
     public int update(BaBlock po){
         return this.dao.updateByPrimaryKeySelective(po) ;
     }
@@ -71,6 +86,7 @@
      * @param id 瀹炰綋ID
      * @return 鏁伴噺
      */
+    @Transactional
     public int delete(Long id){
         return this.dao.deleteLogicById(id) ;
     }

--
Gitblit v1.8.0