From 37b627623f03f58fef28f4a87a049ccabda6f72d Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 13 一月 2025 09:55:13 +0800
Subject: [PATCH] 增加一个vo
---
pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/changeSome/ChSomeIntakeAmountSv.java | 13 +++++++++++--
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoTmp/ChangeMapper.java | 2 +-
pipIrr-platform/pipIrr-global/src/main/resources/mapper/Temp4ChangeMapper.xml | 8 ++++----
pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/changeSome/ChSomeCtrl.java | 4 +++-
4 files changed, 19 insertions(+), 8 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 fb4ea55..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
@@ -63,7 +63,7 @@
* 鍒犻櫎鎵�鏈夊彇姘村彛鐨勬棩鐢ㄦ按閲忕粺璁�
* @return 褰卞搷瀹炰綋鏁�
*/
- int deleteAllIntakeAmountDay();
+ int deleteSomeIntakeAmountDay();
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Temp4ChangeMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Temp4ChangeMapper.xml
index 20d37a3..e37d911 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Temp4ChangeMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Temp4ChangeMapper.xml
@@ -44,8 +44,8 @@
</update>
- <delete id="deleteAllIntakeAmountDay">
- delete from rm_intake_amount_day
+ <delete id="deleteSomeIntakeAmountDay">
+ delete from rm_intake_amount_day where times is null
</delete>
<!-- -->
@@ -55,8 +55,8 @@
sum(cl_this_money) as money,
count(id) as times
from rm_open_close_valve_history
- where cl_dt <![CDATA[>=]]> #{startDt, jdbcType=DATE}
- and cl_dt <![CDATA[<=]]> #{endDt, jdbcType=DATE}
+ where cl_dt <![CDATA[>=]]> #{startDt, jdbcType=TIMESTAMP}
+ and cl_dt <![CDATA[<=]]> #{endDt, jdbcType=TIMESTAMP}
group by intake_id
</select>
<select id="selectStIntakeDayStatisticsByDate" resultType="com.dy.pipIrrGlobal.pojoRm.RmIntakeAmountDay">
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/changeSome/ChSomeCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/changeSome/ChSomeCtrl.java
index 320da48..70bf3f2 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/changeSome/ChSomeCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/changeSome/ChSomeCtrl.java
@@ -61,8 +61,10 @@
@GetMapping(path = "reStatisticsAllIntakeDayAmount")
@SsoAop()
public BaseResponse<Boolean> reStatisticsAllIntakeDayAmount() throws Exception{
- this.intakeAmountSv.deleteAllIntakeAmountDay();
+ // 涓嶈兘鍒犻櫎锛屼互淇濈暀鍘熷id
+ // this.intakeAmountSv.deleteAllIntakeAmountDay();
this.intakeAmountSv.statisticsIntakeAmountDay();
+ this.intakeAmountSv.deleteSomeIntakeAmountDay();
return BaseResponseUtils.buildSuccess(true);
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/changeSome/ChSomeIntakeAmountSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/changeSome/ChSomeIntakeAmountSv.java
index 08dea82..f7c8286 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/changeSome/ChSomeIntakeAmountSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/changeSome/ChSomeIntakeAmountSv.java
@@ -138,11 +138,20 @@
* 鍒犻櫎鎵�鏈夊彇姘村彛鏃ュ彇姘撮噺缁熻
* @throws Exception
*/
+ //@Transactional
+ //public void deleteAllIntakeAmountDay(){
+ // dao.deleteAllIntakeAmountDay();
+ //}
+ /**
+ * 鍒犻櫎涓�浜涘彇姘村彛鏃ュ彇姘撮噺缁熻
+ * @throws Exception
+ */
@Transactional
- public void deleteAllIntakeAmountDay(){
- dao.deleteAllIntakeAmountDay();
+ public void deleteSomeIntakeAmountDay(){
+ dao.deleteSomeIntakeAmountDay();
}
+
/**
* 缁熻鍙栨按鍙ｆ棩鍙栨按閲�
* @throws Exception
--
Gitblit v1.8.0