From e41f7a8cb42d189d7af204499e64f12a9ac553b7 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期二, 30 四月 2024 17:12:27 +0800
Subject: [PATCH] 改为连表查询

---
 ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 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..d6d1b62 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml
@@ -26,17 +26,17 @@
         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}
+        <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.beginCreateTime != null">
+            AND r.create_time between #{query.beginCreateTime} and #{query.endCreateTime}
         </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
     </select>

--
Gitblit v1.8.0