From 1f19230e00b543b58f03853df1a38ebd8b508e55 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 21 二月 2025 16:55:01 +0800
Subject: [PATCH] 发布灌溉计划并生成开阀计划
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportHistoryMapper.xml | 33 ++++++++++++++++++++-------------
1 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportHistoryMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportHistoryMapper.xml
index 3735f0e..0f63312 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportHistoryMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportHistoryMapper.xml
@@ -235,16 +235,16 @@
INNER JOIN pr_intake inta ON inta.id = oh.intake_id
<where>
<if test="intakeId != null and intakeId >0">
- AND oh.intake_id = #{intakeId}
+ AND oh.intake_id = #{intakeId,jdbcType=BIGINT}
</if>
<if test = "intakeNum != null and intakeNum !=''">
- AND inta.name LIKE CONCAT('%',#{intakeNum},'%')
+ AND inta.name LIKE CONCAT('%',#{intakeNum,jdbcType=VARCHAR},'%')
</if>
<if test = "rtuAddr != null and rtuAddr !=''">
- AND oh.rtu_addr LIKE CONCAT('%',#{rtuAddr},'%')
+ AND oh.rtu_addr LIKE CONCAT('%',#{rtuAddr,jdbcType=VARCHAR},'%')
</if>
<if test = "timeStart != null and timeStop != null">
- AND oh.dt BETWEEN #{timeStart} AND #{timeStop}
+ AND oh.dt BETWEEN #{timeStart,jdbcType=INTEGER} AND #{timeStop,jdbcType=INTEGER}
</if>
</where>
ORDER BY oh.dt DESC
@@ -261,16 +261,18 @@
COUNT(*) AS recordCount
FROM pr_intake inta
LEFT JOIN
- (SELECT * FROM rm_on_hour_report_history
+ (SELECT intake_id FROM rm_on_hour_report_history
<where>
- <if test = "timeStart != null and timeStop != null">
- dt BETWEEN #{timeStart} AND #{timeStop}
+ <if test = "idStart != null">
+ id <![CDATA[>=]]> #{idStart}
+ </if>
+ <if test = "idEnd != null">
+ AND id <![CDATA[<=]]> #{idEnd}
</if>
</where>) his
ON his.intake_id = inta.id
- INNER JOIN ba_block blo ON blo.id = inta.blockId
+ LEFT JOIN ba_block blo ON blo.id = inta.blockId
WHERE his.intake_id IS NULL AND inta.deleted = 0
-
</select>
<!--鑾峰彇鎸囧畾鏃堕棿娈靛唴鏈笂绾跨殑鍙栨按鍙�-->
@@ -278,17 +280,22 @@
SELECT
inta.id AS intakeId,
inta.name AS intakeNum,
+ inta.lng AS lng,
+ inta.lat AS lat,
blo.name AS blockName
FROM pr_intake inta
LEFT JOIN
- (SELECT * FROM rm_on_hour_report_history
+ (SELECT intake_id FROM rm_on_hour_report_history
<where>
- <if test = "timeStart != null and timeStop != null">
- dt BETWEEN #{timeStart} AND #{timeStop}
+ <if test = "idStart != null">
+ id <![CDATA[>=]]> #{idStart}
+ </if>
+ <if test = "idEnd != null">
+ AND id <![CDATA[<=]]> #{idEnd}
</if>
</where>) his
ON his.intake_id = inta.id
- INNER JOIN ba_block blo ON blo.id = inta.blockId
+ LEFT JOIN ba_block blo ON blo.id = inta.blockId
WHERE his.intake_id IS NULL AND inta.deleted = 0
ORDER BY inta.id
<trim prefix="limit " >
--
Gitblit v1.8.0