From c3d51f9ba3300b60261d13a5b0b4f7402bba0ee0 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期三, 02 四月 2025 08:30:00 +0800
Subject: [PATCH] 修改轮灌组接口、分页获取轮灌组接口、获取全部轮灌组接口、获取轮灌组详情接口
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmOpenCloseValveHistoryMapper.java | 122 +++++++++++++++++++++++++++++++++-------
1 files changed, 99 insertions(+), 23 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmOpenCloseValveHistoryMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmOpenCloseValveHistoryMapper.java
index 6002ef3..3fbbcb1 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmOpenCloseValveHistoryMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmOpenCloseValveHistoryMapper.java
@@ -2,13 +2,14 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dy.pipIrrGlobal.pojoRm.RmOpenCloseValveHistory;
+import com.dy.pipIrrGlobal.voRm.VoExpend;
import com.dy.pipIrrGlobal.voRm.VoOpenCloseValve;
-import com.dy.pipIrrGlobal.voSt.VoClient;
-import com.dy.pipIrrGlobal.voSt.VoIntake;
-import com.dy.pipIrrGlobal.voSt.VoIntakeAccumulateAmount;
-import com.dy.pipIrrGlobal.voSt.VoIntakeOpenCount;
+import com.dy.pipIrrGlobal.voRm.VoOpenClostWechat;
+import com.dy.pipIrrGlobal.voSt.*;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -94,7 +95,7 @@
* @param params
* @return
*/
- List<VoIntake> getNeverOpenValveIntakes(Map<?, ?> params);
+ List<VoIntakeUnOpenValve> getNeverOpenValveIntakes(Map<?, ?> params);
/**
* 鑾峰彇鎸囧畾鏃堕棿娈靛唴寮�闃�娆℃暟瓒呰繃鎸囧畾鍊肩殑鍙栨按鍙ｆ暟閲�
@@ -167,6 +168,20 @@
List<VoClient> getLargeWaterConsumptionClients(Map<String, Object> params);
/**
+ * 鑾峰彇鎸囧畾鏃堕棿娈靛唴鐢ㄦ按閲忎綆浜庢寚瀹氬�肩殑鍐滄埛鏁伴噺
+ * @param params
+ * @return
+ */
+ Long getSmallWaterConsumptionClientsCount(Map<String, Object> params);
+
+ /**
+ * 鑾峰彇鎸囧畾鏃堕棿娈靛唴鐢ㄦ按閲忎綆浜庢寚瀹氬�肩殑鍐滄埛
+ * @param params
+ * @return
+ */
+ List<VoClient> getSmallWaterConsumptionClients(Map<String, Object> params);
+
+ /**
* 鑾峰彇鎸囧畾鏃堕棿娈靛唴娑堣垂閲戦瓒呰繃鎸囧畾鍊肩殑鍐滄埛鏁伴噺
* @param params
* @return
@@ -179,6 +194,20 @@
* @return
*/
List<VoClient> getLargeAmountSpentClients(Map<String, Object> params);
+
+ /**
+ * 鑾峰彇鎸囧畾鏃堕棿娈靛唴娑堣垂閲戦浣庝簬鎸囧畾鍊肩殑鍐滄埛鏁伴噺
+ * @param params
+ * @return
+ */
+ Long getSmallAmountSpentClientsCount(Map<String, Object> params);
+
+ /**
+ * 鑾峰彇鎸囧畾鏃堕棿娈靛唴娑堣垂閲戦浣庝簬鎸囧畾鍊肩殑鍐滄埛
+ * @param params
+ * @return
+ */
+ List<VoClient> getSmallAmountSpentClients(Map<String, Object> params);
/**
* 鑾峰彇鎸囧畾鏃堕棿娈靛唴鐢ㄦ按鏃堕暱瓒呰繃鎸囧畾鍊肩殑鍐滄埛鏁伴噺
@@ -195,32 +224,18 @@
List<VoClient> getLargeWaterDurationClients(Map<String, Object> params);
/**
- * 鎸囧畾鏃堕棿娈电敤姘撮噺瓒呰繃鎸囧畾鍊肩殑鍙栨按鍙ｆ暟閲�
+ * 鑾峰彇鎸囧畾鏃堕棿娈靛唴鐢ㄦ按鏃堕暱浣庝簬鎸囧畾鍊肩殑鍐滄埛鏁伴噺
* @param params
* @return
*/
- Long getUseWaterGtValueIntakesCount(Map<String, Object> params);
+ Long getSmallWaterDurationClientsCount(Map<String, Object> params);
/**
- * 鎸囧畾鏃堕棿娈电敤姘撮噺瓒呰繃鎸囧畾鍊肩殑鍙栨按鍙�
+ * 鑾峰彇鎸囧畾鏃堕棿娈靛唴鐢ㄦ按鏃堕暱浣庝簬鎸囧畾鍊肩殑鍐滄埛
* @param params
* @return
*/
- List<VoIntakeAccumulateAmount> getUseWaterGtValueIntakes(Map<String, Object> params);
-
- /**
- * 鎸囧畾鏃堕棿娈靛唴娑堣垂閲戦瓒呰繃鎸囧畾鍊肩殑鍙栨按鍙ｇ殑鏁伴噺
- * @param params
- * @return
- */
- Long getExpenseGtValueIntakesCount(Map<String, Object> params);
-
- /**
- * 鎸囧畾鏃堕棿娈靛唴娑堣垂閲戦瓒呰繃鎸囧畾鍊肩殑鍙栨按鍙�
- * @param params
- * @return
- */
- List<VoIntakeAccumulateAmount> getExpenseGtValueIntakes(Map<String, Object> params);
+ List<VoClient> getSmallWaterDurationClients(Map<String, Object> params);
/**
* 鎸囧畾鏃堕棿娈靛唴鐢ㄦ按鏃堕暱瓒呰繃鎸囧畾鍊肩殑鍙栨按鍙ｆ暟閲�
@@ -263,4 +278,65 @@
* @return
*/
List<VoIntake> getNoOpenHaveCloseIntakes(Map<String, Object> params);
+
+ /**
+ * 鑾峰彇姘村崱娑堣垂璁板綍鏁伴噺锛岀鐞嗗钩鍙颁娇鐢�
+ * @param params
+ * @return
+ */
+ Long getExpendsCount(Map<String, Object> params);
+
+ /**
+ * 鑾峰彇姘村崱娑堣垂璁板綍锛岀鐞嗗钩鍙颁娇鐢�
+ * @param params
+ * @return
+ */
+ List<VoExpend> getExpends(Map<String, Object> params);
+
+ /**
+ * 鑾峰彇鐗╃悊鍗″紑鍏抽榾璁板綍鏁伴噺锛屽井淇″皬绋嬪簭浣跨敤
+ * @return
+ */
+ Long getCardOpenCloseCount(Map<String, Object> params);
+
+ /**
+ * 鑾峰彇鐗╃悊鍗″紑鍏抽榾璁板綍锛屽井淇″皬绋嬪簭浣跨敤
+ * @return
+ */
+ List<VoOpenClostWechat> getCardOpenClose(Map<String, Object> params);
+
+ /**
+ * 鑾峰彇铏氭嫙鍗″紑鍏抽榾璁板綍鏁伴噺锛屽井淇″皬绋嬪簭浣跨敤
+ * @return
+ */
+ Long getVcCardOpenCloseCount(Map<String, Object> params);
+
+ /**
+ * 鑾峰彇铏氭嫙鍗″紑鍏抽榾璁板綍锛屽井淇″皬绋嬪簭浣跨敤
+ * @param params
+ * @return
+ */
+ List<VoOpenClostWechat> getVcCardOpenClose(Map<String, Object> params);
+
+ //////////////////////////////////////////
+ // //
+ //缁熻鐩稿叧 //
+ // //
+ //////////////////////////////////////////
+
+ /**
+ * 浠ュ啘鎴枫�佸啘鎴稩C鍗′负鍗曚綅杩涜缁熻
+ * @param startDt
+ * @param endDt
+ * @return
+ */
+ List<VoIcConsumeStatistics> statisticsByIc(@Param("startDt")Date startDt, @Param("endDt")Date endDt);
+
+ /**
+ * 浠ュ啘鎴蜂负鍗曚綅杩涜缁熻
+ * @param startDt
+ * @param endDt
+ * @return
+ */
+ List<VoClientConsumeStatistics> statisticsByClient(@Param("startDt")Date startDt, @Param("endDt")Date endDt);
}
\ No newline at end of file
--
Gitblit v1.8.0