From 863b22dd84364ef5a9c4d5057af5063f94e8f346 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 04 九月 2024 03:45:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml | 16 ++++++++++++++++
1 files changed, 16 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 7ba82e0..1b7816b 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml
@@ -23,6 +23,7 @@
r.id, r.report_materials, r.create_time, r.report_type, r.report_content, r.status, r.serial_number as pointId,
r.begin_create_time,
r.end_create_time,
+ r.import_batch_number,
u.unit_name,
p.yw_person_name as peopleName,
pt.point_name,
@@ -40,6 +41,9 @@
<if test="query.reportType != null and query.reportType != ''">
AND r.report_type = #{query.reportType}
</if>
+ <if test="query.unitId != null">
+ AND r.unit_id = #{query.unitId}
+ </if>
<if test="query.status != null">
AND r.status = #{query.status}
</if>
@@ -50,6 +54,7 @@
r.id, r.report_materials, r.create_time, r.report_type, r.report_content, r.status, r.serial_number,
r.begin_create_time,
r.end_create_time,
+ r.import_batch_number,
u.unit_name,
p.yw_person_name,
pt.point_name
@@ -89,6 +94,17 @@
LIMIT 1
</select>
+ <select id="getTogether" resultType="com.ycl.platform.domain.vo.ReportVO">
+ SELECT
+ r.id,
+ p.point_name
+ FROM
+ t_report r
+ INNER JOIN t_yw_point p ON r.serial_number = p.serial_number
+ WHERE
+ r.import_batch_number = #{pid} AND r.deleted = 0 AND r.status != 1 AND p.deleted = 0
+ </select>
+
--
Gitblit v1.8.0