From 6707cf22587cba66f79a29145cc735a7c029dd05 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 09 九月 2024 13:35:02 +0800
Subject: [PATCH] 设置新设备bug
---
ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml
index e904349..1b7816b 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml
@@ -41,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>
@@ -96,10 +99,10 @@
r.id,
p.point_name
FROM
- t_report t
- INNER JOIN t_yw_point p ON t.serial_number = p.serial_number
+ t_report r
+ INNER JOIN t_yw_point p ON r.serial_number = p.serial_number
WHERE
- t.import_batch_number = #{pid} AND r.deleted = 0 AND r.status != 1 AND p.deleted = 0
+ r.import_batch_number = #{pid} AND r.deleted = 0 AND r.status != 1 AND p.deleted = 0
</select>
--
Gitblit v1.8.0