From 9343e802bd45a58de02343db3832b4c7dd16e49e Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 14 七月 2025 11:06:22 +0800
Subject: [PATCH] 修改用水户年用水量统计查询中的bug

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StClientAmountYearMapper.java |   58 ++++++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 46 insertions(+), 12 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StClientAmountYearMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StClientAmountYearMapper.java
index e75f9a5..4f30322 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StClientAmountYearMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StClientAmountYearMapper.java
@@ -1,22 +1,24 @@
 package com.dy.pipIrrGlobal.daoSt;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.dy.pipIrrGlobal.pojoSt.StClientAmountYear;
-import com.dy.pipIrrGlobal.pojoSt.StIntakeAmountYear;
+import com.dy.pipIrrGlobal.voSt.VoStClientAmountYearRecord;
+import com.dy.pipIrrGlobal.voSt.VoStClientIdAmountYearRecord;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Author: liurunyu
- * @Date: 2024/7/24 17:03
+ * @Date: 2024/12/30 9:21
  * @Description
  */
 @Mapper
-public interface StClientAmountYearMapper extends BaseMapper<StClientAmountYear> {
+public interface StClientAmountYearMapper {
     /**
      * delete by primary key
+     *
      * @param id primaryKey
      * @return deleteCount
      */
@@ -24,6 +26,7 @@
 
     /**
      * insert record to table
+     *
      * @param record the record
      * @return insert count
      */
@@ -31,6 +34,7 @@
 
     /**
      * insert record to table selective
+     *
      * @param record the record
      * @return insert count
      */
@@ -38,21 +42,15 @@
 
     /**
      * select by primary key
+     *
      * @param id primary key
      * @return object by primary key
      */
     StClientAmountYear selectByPrimaryKey(Long id);
 
     /**
-     * 鏌ヨ鏌愬勾鏌愬彇姘村彛鐨勫勾鏌愰噺鍊�
-     * @param clientId 鍐滄埛ID
-     * @param year 鏌愬勾
-     * @return
-     */
-    List<StClientAmountYear> selectByClientIdAndYear(@Param("clientId")Long clientId, @Param("year")Integer year) ;
-
-    /**
      * update record selective
+     *
      * @param record the updated record
      * @return update count
      */
@@ -60,8 +58,44 @@
 
     /**
      * update record
+     *
      * @param record the updated record
      * @return update count
      */
     int updateByPrimaryKey(StClientAmountYear record);
+
+
+
+    //////////////////////////////////////
+    //鏌ヨ缁熻缁撴灉
+    /**
+     * 鏌ヨ鎬绘暟閲�
+     * @param params
+     * @return
+     */
+    Long selectCountYearStatistics(Map<?, ?> params) ;
+    Long selectCountYearStatistics4OneYear(Map<?, ?> params) ;
+
+    List<VoStClientIdAmountYearRecord> selectClientIds4YearStatistics(Map<?, ?> params) ;
+    /**
+     * 鏌ヨ鍒嗛〉鏁版嵁
+     * @param params
+     * @return
+     */
+    List<VoStClientAmountYearRecord> selectYearStatistics4OneYear(Map<?, ?> params) ;
+    List<VoStClientAmountYearRecord> selectYearStatistics(Map<?, ?> params) ;
+
+    //////////////////////////////////////
+    //缁熻鐩稿叧
+    /**
+     * 鏌ヨ鏌愬勾 鏌愰噺鍊�
+     *
+     * @param year 鏌愬勾
+     * @return
+     */
+    List<StClientAmountYear> selectByYear(@Param("year") Integer year);
+
+    /////////////////////////////////////
+    //涓存椂浠诲姟
+    int deleteAll() ;
 }
\ No newline at end of file

--
Gitblit v1.8.0