From 1a2b07f01ba4616fd9e894dddf474b56d020158c Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期一, 07 四月 2025 15:18:51 +0800 Subject: [PATCH] 整理版本 --- pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StIntakeAmountMonthMapper.java | 34 ++++++++++++++++++++++++++++++++-- 1 files changed, 32 insertions(+), 2 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 2f0f5fe..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,10 +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 @@ -52,7 +54,7 @@ * @param month 鏌愭湀 * @return */ - StIntakeAmountMonth selectByIntakeIdAndYearAndMonth(@Param("intakeId")Long intakeId, @Param("year")Integer year, @Param("month")Integer month) ; + List<StIntakeAmountMonth> selectByIntakeIdAndYearAndMonth(@Param("intakeId")Long intakeId, @Param("year")Integer year, @Param("month")Integer month) ; /** @@ -74,11 +76,39 @@ * @param year 缁熻骞村害 * @return */ - List<VoIntakeAmountStatistics> statisticsByIntake(Integer year, Integer month, Long startId, Long endId) ; + 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) ; + + /** + * 鏌ヨ缁熻鍙栨按鍙f湀婕忔崯閲� + * @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