From 49cc25af3ee07e1d0366588db5b5c01483057185 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 04 九月 2024 18:03:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 insertions(+), 0 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
index 5be7391..a4e932f 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
@@ -181,4 +181,37 @@
AND deleted = 0
</select>
+ <select id="select" resultType="com.ycl.platform.domain.entity.YwPoint">
+ SELECT
+ *
+ FROM
+ t_yw_point
+ <where>
+ <if test="keyword != null and keyword != ''">
+ AND (serial_number like concat('%', #{keyword}, '%') or point_name like concat('%', #{keyword}, '%'))
+ </if>
+ <if test="unitId != null">
+ AND unit_id = #{unitId}
+ </if>
+ AND deleted = 0
+ </where>
+
+ </select>
+
+ <select id="getReportResult" resultType="com.ycl.platform.domain.vo.ReportAuditingRecordVO">
+ SELECT
+ ar.result, r.begin_create_time, r.end_create_time
+ FROM
+ t_report r
+ INNER JOIN t_report_auditing_record ar ON r.id = ar.report_id
+ AND ar.deleted = 0
+ AND r.report_type = #{reportType}
+ AND r.deleted = 0
+ AND r.serial_number = #{serialNumber}
+ AND ar.result = 1
+ ORDER BY
+ ar.create_time DESC
+ limit 1
+ </select>
+
</mapper>
--
Gitblit v1.8.0