From b6d477ad41e2a8ff9393de2beba2e735c78cf781 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 22 七月 2024 18:06:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml | 25 +++++++++++++++++++++++++
1 files changed, 25 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..a6bac16 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml
@@ -16,4 +16,29 @@
<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
+ 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>
+ <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.create_time DESC
+ </select>
+
</mapper>
--
Gitblit v1.8.0