From eb50888b14af04d5f4677520b67754764f03a014 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 07 四月 2025 09:52:12 +0800
Subject: [PATCH] Stop tracking ignored files
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml
index 852e3b5..3c10897 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml
@@ -559,7 +559,7 @@
SELECT COUNT(*) AS recordCount
FROM pr_intake inta
LEFT JOIN
- (SELECT intake_id FROM rm_on_hour_report_history
+ (SELECT intake_id FROM rm_open_close_valve_history
<where>
<if test = "idStart != null">
id <![CDATA[>=]]> #{idStart}
@@ -583,7 +583,7 @@
pct.rtuAddr AS rtuAddr
FROM pr_intake inta
LEFT JOIN
- (SELECT intake_id FROM rm_on_hour_report_history
+ (SELECT intake_id FROM rm_open_close_valve_history
<where>
<if test = "idStart != null">
id <![CDATA[>=]]> #{idStart}
@@ -611,7 +611,7 @@
inta.name AS intakeNum,
blo.name AS blockName
FROM pr_intake inta
- LEFT JOIN (SELECT intake_id
+ INNER JOIN (SELECT intake_id
FROM rm_open_close_valve_history
WHERE id <![CDATA[>=]]> #{idStart} AND id <![CDATA[<=]]> #{idEnd}
) his ON his.intake_id = inta.id
@@ -629,7 +629,7 @@
inta.lat AS lat,
blo.name AS blockName
FROM pr_intake inta
- LEFT JOIN(SELECT intake_id
+ INNER JOIN(SELECT intake_id
FROM rm_open_close_valve_history
WHERE id <![CDATA[>=]]> #{idStart} AND id <![CDATA[<=]]> #{idEnd}
) his ON his.intake_id = inta.id
@@ -653,7 +653,7 @@
inta.name AS intakeNum,
blo.name AS blockName
FROM pr_intake inta
- LEFT JOIN (SELECT intake_id
+ INNER JOIN (SELECT intake_id
FROM rm_open_close_valve_history
WHERE id <![CDATA[>=]]> #{idStart} AND id <![CDATA[<=]]> #{idEnd}
) his ON his.intake_id = inta.id
@@ -671,7 +671,7 @@
inta.lat AS lat,
blo.name AS blockName
FROM pr_intake inta
- LEFT JOIN(SELECT intake_id
+ INNER JOIN(SELECT intake_id
FROM rm_open_close_valve_history
WHERE id <![CDATA[>=]]> #{idStart} AND id <![CDATA[<=]]> #{idEnd}
) his ON his.intake_id = inta.id
@@ -1336,8 +1336,8 @@
count(ocvh.id) as times
from rm_open_close_valve_history ocvh
inner join se_client_card cc on CAST(cc.cardNum AS CHAR) = ocvh.cl_ic_card_no
- where ocvh.cl_dt <![CDATA[>=]]> #{startDt, jdbcType=BIGINT}
- and ocvh.cl_dt <![CDATA[<=]]> #{endDt, jdbcType=BIGINT}
+ where ocvh.cl_dt <![CDATA[>=]]> #{startDt, jdbcType=TIMESTAMP }
+ and ocvh.cl_dt <![CDATA[<=]]> #{endDt, jdbcType=TIMESTAMP}
group by ocvh.client_id, cc.id
</select>
<select id="statisticsByClient" resultType="com.dy.pipIrrGlobal.voSt.VoClientConsumeStatistics">
@@ -1347,8 +1347,8 @@
sum(cl_this_time) as duration,
count(id) as times
from rm_open_close_valve_history
- where cl_dt <![CDATA[>=]]> #{startDt, jdbcType=BIGINT}
- and cl_dt <![CDATA[<=]]> #{endDt, jdbcType=BIGINT}
+ where cl_dt <![CDATA[>=]]> #{startDt, jdbcType=TIMESTAMP}
+ and cl_dt <![CDATA[<=]]> #{endDt, jdbcType=TIMESTAMP}
group by client_id
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0