From de2fafa2e1fc28b7f1780b5ebb27feaeed0ef0c6 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 06 一月 2025 15:36:45 +0800
Subject: [PATCH] 1、王江海协议上线解析中未把版本号放入IoSession中的问题解决； 2、配置文件调整与统一
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmOpenCloseValveHistoryMapper.java | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 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 acf5ddc..01dc0fb 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
@@ -5,12 +5,11 @@
import com.dy.pipIrrGlobal.voRm.VoExpend;
import com.dy.pipIrrGlobal.voRm.VoOpenCloseValve;
import com.dy.pipIrrGlobal.voRm.VoOpenClostWechat;
-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.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;
@@ -346,4 +345,26 @@
* @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