From 595b66ae8800511fab34e503f94d173613088c08 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 01 三月 2025 09:57:38 +0800
Subject: [PATCH] 1、表阀一体机新协议开阀报关阀报数据处理逻辑修改； 2、农户月用水统计查询中，缺少农户姓名，进行SQL修改。
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StIntakeAmountMonthMapper.java | 47 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 47 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StIntakeAmountMonthMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StIntakeAmountMonthMapper.java
index 8b643fa..775e396 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StIntakeAmountMonthMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StIntakeAmountMonthMapper.java
@@ -5,9 +5,12 @@
import com.dy.pipIrrGlobal.pojoSt.StLossMonth;
import com.dy.pipIrrGlobal.voSt.VoIntakeAmountStatistics;
import com.dy.pipIrrGlobal.voSt.VoIntakeLossStatistics;
+import com.dy.pipIrrGlobal.voSt.VoMonthAmount;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
import java.util.List;
+import java.util.Map;
/**
* @Author: liurunyu
@@ -45,6 +48,16 @@
StIntakeAmountMonth selectByPrimaryKey(Long id);
/**
+ * 鏌ヨ鏌愬勾鏌愭湀鏌愬彇姘村彛鐨勬湀鏌愰噺鍊�
+ * @param intakeId 鍙栨按ID
+ * @param year 鏌愬勾
+ * @param month 鏌愭湀
+ * @return
+ */
+ List<StIntakeAmountMonth> selectByIntakeIdAndYearAndMonth(@Param("intakeId")Long intakeId, @Param("year")Integer year, @Param("month")Integer month) ;
+
+
+ /**
* update record selective
* @param record the updated record
* @return update count
@@ -63,5 +76,39 @@
* @param year 缁熻骞村害
* @return
*/
+ List<VoIntakeAmountStatistics> statisticsByIntake(@Param("year")Integer year, @Param("month")Integer month, @Param("startId")Long startId, @Param("endId")Long endId) ;
+ /**
+ * 浠ュ彇姘村彛缁村害缁熻鍙栨按閲�
+ * @param year 缁熻骞村害
+ * @return
+ */
List<VoIntakeAmountStatistics> statisticsByIntake(Integer year) ;
+
+
+ ////////////////////////////////////////////////
+ // 缁熻鏌ヨ
+ ///////////////////////////////////////////////
+
+ /**
+ * 涓烘煡璇㈢粺璁″彇姘村彛鏃ユ紡鎹熼噺锛岀粺璁″彇姘村彛鏁伴噺
+ * @param intakeN
+ * @return
+ */
+ Long selectIntakeCount4AmountMonth(@Param("intakeNum")String intakeN) ;
+
+ /**
+ * 涓烘煡璇㈢粺璁″彇姘村彛鏃ユ紡鎹熼噺锛屾煡璇竴椤靛彇姘村彛ID
+ * @param params
+ * @return
+ */
+ List<VoMonthAmount> selectIntakes4AmountMonth(Map<?, ?> params) ;
+
+ /**
+ * 鏌ヨ缁熻鍙栨按鍙ｆ湀婕忔崯閲�
+ * @param params
+ * @return
+ */
+ //涓嬮潰1鍒�12鏈堝垎浜�2涓煡璇紝鍘熷洜鏄湪涓�涓煡璇腑锛岄潪甯告參锛屼笉鐭ラ亾浠�涔堝師鍥狅紝涔熻鏄瓙鏌ヨ澶鐨勫師鍥�
+ List<VoMonthAmount> selectIntakeAmountOfMonth01_06(Map<?, ?> params);
+ List<VoMonthAmount> selectIntakeAmountOfMonth07_12(Map<?, ?> params);
}
\ No newline at end of file
--
Gitblit v1.8.0