From 26b03b6720fe222be3fdad7931a94a4842dca0c2 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 21 八月 2024 11:52:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml |    8 ++++++++
 1 files changed, 8 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 382f7b4..52bf32f 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml
@@ -60,6 +60,14 @@
                     FROM t_report
                     WHERE id = #{id} AND deleted = 0
             ) as rr ON r.identify = rr.identify AND r.create_time &lt;= 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>
 </mapper>

--
Gitblit v1.8.0