From 8e49eae6b1c33e0a02742af2657a1f2c0b89d95b Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 06 八月 2024 17:46:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml | 51 +++++++++++++++++++++++++++++++++++++--------------
1 files changed, 37 insertions(+), 14 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml
index 17b7c91..cc7b9e9 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml
@@ -21,24 +21,47 @@
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'
- where
- r.deleted = '0'
- <if test="reportType != null and reportType != ''">
- AND r.report_type = #{reportType}
+ 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="beginCreateTime != null">
- AND r.create_time between #{beginCreateTime} and #{endCreateTime}
+ <if test="query.status != null">
+ AND r.status = #{query.status}
</if>
- <if test="pointId != null and pointId != ''">
- AND pt.point_name like concat('%', #{pointId}, '%')
+ <if test="query.pointId != null and query.pointId != ''">
+ AND pt.point_name like concat('%', #{query.pointId}, '%')
</if>
- <if test="peopleId != null and peopleId != ''">
- AND p.yw_person_name like concat('%', #{peopleId}, '%')
+ <if test="query.peopleId != null and query.peopleId != ''">
+ AND p.yw_person_name like concat('%', #{query.peopleId}, '%')
</if>
- ORDER BY r.create_time DESC
+ 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