From ae0eb7430e0c89cb16bc97f6321bfc1e6703c395 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期四, 31 十月 2024 12:05:39 +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/RmOnHourReportHistoryMapper.java | 24 +++++------------------- 1 files changed, 5 insertions(+), 19 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmOnHourReportHistoryMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmOnHourReportHistoryMapper.java index 88ac1f1..434000e 100644 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmOnHourReportHistoryMapper.java +++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmOnHourReportHistoryMapper.java @@ -3,8 +3,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.dy.pipIrrGlobal.pojoRm.RmOnHourReportHistory; import com.dy.pipIrrGlobal.voRm.VoOnHour; -import com.dy.pipIrrGlobal.voSt.VoCumulativeFlow; import com.dy.pipIrrGlobal.voSt.VoIntake; +import com.dy.pipIrrGlobal.voSt.VoIntakeAccumulateAmount; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -88,30 +88,16 @@ List<VoIntake> getNotOnlineIntakes(Map<?, ?> params); /** - * 鑾峰彇绱娴侀噺瓒呰繃鎸囧畾鍊肩殑鍙栨按鍙f暟閲� + * 鎸囧畾鏃堕棿娈靛唴绱Н娴侀噺瓒呰繃鎸囧畾鍊肩殑鍙栨按鍙f暟閲� * @param params * @return */ - Long getLargeFlowIntakesCount(Map<?, ?> params); + Long getTotalFlowGtValueIntakesCount(Map<String, Object> params); /** - * 鑾峰彇绱娴侀噺瓒呰繃鎸囧畾鍊肩殑鍙栨按鍙� + * 鎸囧畾鏃堕棿娈靛唴绱Н娴侀噺瓒呰繃鎸囧畾鍊肩殑鍙栨按鍙� * @param params * @return */ - List<VoCumulativeFlow> getLargeFlowIntakes(Map<?, ?> params); - - /** - * 鑾峰彇绱娴侀噺浣庝簬鎸囧畾鍊肩殑鍙栨按鍙f暟閲� - * @param params - * @return - */ - Long getSmallFlowIntakesCount(Map<?, ?> params); - - /** - * 鑾峰彇绱娴侀噺浣庝簬鎸囧畾鍊肩殑鍙栨按鍙� - * @param params - * @return - */ - List<VoCumulativeFlow> getSmallFlowIntakes(Map<?, ?> params); + List<VoIntakeAccumulateAmount> getTotalFlowGtValueIntakes(Map<String, Object> params); } \ No newline at end of file -- Gitblit v1.8.0