From 1e6561acc89b7105c1dcbf5395845d6046f1453d Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 21 二月 2025 16:55:09 +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/daoTmp/ChangeMapper.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoTmp/ChangeMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoTmp/ChangeMapper.java
index 3c371ea..8700793 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoTmp/ChangeMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoTmp/ChangeMapper.java
@@ -8,6 +8,7 @@
import com.dy.pipIrrGlobal.pojoSt.StLossMonth;
import com.dy.pipIrrGlobal.pojoSt.StLossYear;
import com.dy.pipIrrGlobal.voSt.VoIntake;
+import com.dy.pipIrrGlobal.voTmp.VoRmIntakeAmountDay;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -62,7 +63,7 @@
* 鍒犻櫎鎵�鏈夊彇姘村彛鐨勬棩鐢ㄦ按閲忕粺璁�
* @return 褰卞搷瀹炰綋鏁�
*/
- int deleteAllIntakeAmountDay();
+ int deleteSomeIntakeAmountDay();
@@ -70,8 +71,8 @@
* 缁熻鎵�鏈夊彇姘村彛鐨勬棩鐢ㄦ按閲�
* @return 瀹炰綋闆嗗悎
*/
- List<RmIntakeAmountDay> statisticAllIntakeAmountDayFromOpenCloseValveHistory(@Param("startDt")Date startDt,
- @Param("endDt")Date endDt);
+ List<VoRmIntakeAmountDay> statisticAllIntakeAmountDayFromOpenCloseValveHistory(@Param("startDt")Date startDt,
+ @Param("endDt")Date endDt);
List<RmIntakeAmountDay> selectStIntakeDayStatisticsByDate(@Param("intakeId")Long intakeId, @Param("date")Date date);
--
Gitblit v1.8.0