From 9b81ed8ec15cc4b3f46c7a630512a268b3a74d74 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 07 八月 2024 16:37:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 48 insertions(+), 0 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml
index 8e237d6..cc7b9e9 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml
@@ -16,4 +16,52 @@
<result column="error_type" property="errorType" />
</resultMap>
+ <select id="page" resultType="com.ycl.platform.domain.vo.ReportVO">
+ SELECT
+ r.*, u.unit_name, p.yw_person_name as peopleName, pt.point_name
+ FROM
+ t_report r
+ LEFT JOIN t_yw_unit u ON r.unit_id = u.id and u.deleted = 0
+ LEFT JOIN t_yw_people p ON r.people_id = p.id and p.deleted = 0
+ LEFT JOIN t_yw_point pt ON r.point_id = pt.id and pt.deleted = 0
+ INNER JOIN (
+ SELECT identify,MAX(create_time) AS create_time
+ FROM t_report
+ WHERE deleted = 0
+ GROUP BY identify
+ ) as rr ON r.create_time = rr.create_time
+ WHERE
+ r.deleted = 0
+ <if test="query.reportType != null and query.reportType != ''">
+ AND r.report_type = #{query.reportType}
+ </if>
+ <if test="query.status != null">
+ AND r.status = #{query.status}
+ </if>
+ <if test="query.pointId != null and query.pointId != ''">
+ AND pt.point_name like concat('%', #{query.pointId}, '%')
+ </if>
+ <if test="query.peopleId != null and query.peopleId != ''">
+ AND p.yw_person_name like concat('%', #{query.peopleId}, '%')
+ </if>
+ ORDER BY r.update_time DESC
+ </select>
+
+ <select id="examineRecord" resultMap="BaseResultMap">
+ SELECT
+ r.*, u.unit_name, p.yw_person_name as peopleName, pt.point_name
+ FROM
+ t_report r
+ LEFT JOIN t_yw_unit u ON r.unit_id = u.id and u.deleted = 0
+ LEFT JOIN t_yw_people p ON r.people_id = p.id and p.deleted = 0
+ LEFT JOIN t_yw_point pt ON r.point_id = pt.id and pt.deleted = 0
+ INNER JOIN (
+ SELECT identify, create_time
+ FROM t_report
+ WHERE id = #{id} AND deleted = 0
+ ) as rr ON r.identify = rr.identify AND r.create_time <= rr.create_time
+ ORDER BY
+ r.create_time DESC
+ </select>
+
</mapper>
--
Gitblit v1.8.0