From 8ca2d2b49dccc417baad02c003eb7d9ae7dacc56 Mon Sep 17 00:00:00 2001 From: wuzeyu <1223318623@qq.com> Date: 星期五, 26 七月 2024 15:49:53 +0800 Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV --- pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmIntakeAmountDayMapper.java | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmIntakeAmountDayMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmIntakeAmountDayMapper.java index 4b2a87e..7b8e54a 100644 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmIntakeAmountDayMapper.java +++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmIntakeAmountDayMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.dy.pipIrrGlobal.pojoRm.RmIntakeAmountDay; +import com.dy.pipIrrGlobal.voRm.VoIntakeAmountDay; import com.dy.pipIrrGlobal.voSt.VoIntakeAmountStatistics; import com.dy.pipIrrGlobal.voSt.VoIntakeLossStatistics; import org.apache.ibatis.annotations.Mapper; @@ -9,6 +10,7 @@ import java.util.Date; import java.util.List; +import java.util.Map; /** * @Author: liurunyu @@ -66,14 +68,27 @@ */ int updateByPrimaryKey(RmIntakeAmountDay record); + /** + * 鏍规嵁鎸囧畾鏉′欢鑾峰彇璁板綍鎬绘暟 + * @param params + * @return + */ + Long getRecordCount(Map<?, ?> params); /** - * 浠ュ彇姘村彛缁村害缁熻鍙栨按閲� + * 鏍规嵁鎸囧畾鏉′欢鑾峰彇璁板綍 + * @param params + * @return + */ + List<VoIntakeAmountDay> getIntakeAmountDayHistory(Map<?, ?> params); + + + /** + * 浠ュ彇姘村彛缁村害缁熻鍙栨按鍙e彇姘撮噺 * @param statisticsStartId 缁熻鏃堕棿娈靛紑濮嬫椂闂村搴旂殑ID * @param statisticsEndId 缁熻鏃堕棿娈垫埅姝㈡椂闂村搴旂殑ID * @return */ List<VoIntakeAmountStatistics> statisticsByIntake(@Param("startId")Long statisticsStartId, @Param("endId")Long statisticsEndId) ; - } \ No newline at end of file -- Gitblit v1.8.0