From b5ef534819e9d1cbcbb138e4cf58acb6a5d7ca6c Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期三, 28 八月 2024 15:17:47 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportHistoryMapper.xml | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 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 74589f4..9616580 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportHistoryMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportHistoryMapper.xml
@@ -260,8 +260,15 @@
SELECT
COUNT(*) AS recordCount
FROM pr_intake inta
- LEFT JOIN (SELECT * FROM rm_on_hour_report_history WHERE dt BETWEEN #{timeStart} AND #{timeStop}) his ON his.intake_id = inta.id
- INNER JOIN ba_block blo ON blo.id = inta.blockId
+ LEFT JOIN
+ (SELECT * FROM rm_on_hour_report_history
+ <where>
+ <if test = "timeStart != null and timeStop != null">
+ dt BETWEEN #{timeStart} AND #{timeStop}
+ </if>
+ </where>) his
+ ON his.intake_id = inta.id
+ INNER JOIN ba_block blo ON blo.id = inta.blockId
WHERE his.intake_id IS NULL AND inta.deleted = 0
</select>
@@ -273,8 +280,15 @@
inta.name AS intakeNum,
blo.name AS blockName
FROM pr_intake inta
- LEFT JOIN (SELECT * FROM rm_on_hour_report_history WHERE dt BETWEEN #{timeStart} AND #{timeStop}) his ON his.intake_id = inta.id
- INNER JOIN ba_block blo ON blo.id = inta.blockId
+ LEFT JOIN
+ (SELECT * FROM rm_on_hour_report_history
+ <where>
+ <if test = "timeStart != null and timeStop != null">
+ dt BETWEEN #{timeStart} AND #{timeStop}
+ </if>
+ </where>) his
+ ON his.intake_id = inta.id
+ INNER 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