From 31d3591b34d4f26ad2ab207ca3044048d9adb9df Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 21 八月 2024 17:51:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 52 insertions(+), 4 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml
index a6bac16..9da4ca5 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml
@@ -24,13 +24,19 @@
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
+ 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.beginCreateTime != null">
- AND r.create_time between #{query.beginCreateTime} and #{query.endCreateTime}
+ <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}, '%')
@@ -38,7 +44,49 @@
<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>
+
+ <select id="selectNumberList" resultType="java.lang.String">
+ SELECT yp.serial_number FROM t_report r
+ LEFT JOIN t_yw_point yp ON r.point_id = yp.id
+ WHERE r.status = #{status} AND
+ #{date} between r.begin_create_time and r.end_create_time
+ </select>
+
+ <select id="checkPointReported" resultType="com.ycl.platform.domain.vo.ReportVO">
+ SELECT
+ r.id, r.errorType
+ FROM
+ t_report r
+ INNER JOIN t_yw_point yo ON r.point_id = yo.id AND yo.deleted = 0
+ INNER JOIN t_work_order wo ON yo.serial_number = wo.serial_number AND wo.serial_number = #{serialNumber} AND wo.deleted = 0
+ WHERE
+ r.status = 1
+ ORDER BY r.auditing_time DESC
+ LIMIT 1
+ </select>
+
+
+
+
+
+
</mapper>
--
Gitblit v1.8.0