From f6962c0ede2f18b8aaeaf69f84b39d459a5a59f4 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 06 八月 2024 13:41:12 +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 | 38 ++++++++++++++++++++++++++++++++++++++
1 files changed, 38 insertions(+), 0 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 dab83eb..461c263 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportHistoryMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportHistoryMapper.xml
@@ -202,6 +202,9 @@
FROM rm_on_hour_report_history oh
INNER JOIN pr_intake inta ON inta.id = oh.intake_id
<where>
+ <if test="intakeId != null and intakeId >0">
+ AND oh.intake_id = #{intakeId}
+ </if>
<if test = "intakeName != null and intakeName !=''">
AND inta.name LIKE CONCAT('%',#{intakeName},'%')
</if>
@@ -231,6 +234,9 @@
FROM rm_on_hour_report_history oh
INNER JOIN pr_intake inta ON inta.id = oh.intake_id
<where>
+ <if test="intakeId != null and intakeId >0">
+ AND oh.intake_id = #{intakeId}
+ </if>
<if test = "intakeNum != null and intakeNum !=''">
AND inta.name LIKE CONCAT('%',#{intakeNum},'%')
</if>
@@ -248,4 +254,36 @@
</if>
</trim>
</select>
+
+ <!--鑾峰彇鎸囧畾鏃堕棿娈靛唴鏈笂绾垮彇姘村彛鏁伴噺-->
+ <select id="getNotOnlineIntakesCount" resultType="java.lang.Long">
+ 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
+ WHERE his.intake_id IS NULL AND inta.deleted = 0
+
+ </select>
+
+ <!--鑾峰彇鎸囧畾鏃堕棿娈靛唴鏈笂绾跨殑鍙栨按鍙�-->
+ <select id="getNotOnlineIntakes" resultType="com.dy.pipIrrGlobal.voSt.VoIntake">
+ SELECT
+ inta.id AS intakeId,
+ 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
+ WHERE his.intake_id IS NULL AND inta.deleted = 0
+ ORDER BY inta.id
+ <trim prefix="limit " >
+ <if test="start != null and count != null">
+ #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
+ </if>
+ </trim>
+ </select>
+
+
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0