From febd32fb0a69a579184b2d341e498fa224f1da05 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 08 九月 2025 14:06:25 +0800
Subject: [PATCH] 提交订单首页查询条件
---
north-glass-erp/src/main/resources/mapper/pp/DamageDetails.xml | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/pp/DamageDetails.xml b/north-glass-erp/src/main/resources/mapper/pp/DamageDetails.xml
index 4f0dd57..6f8d0f5 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/DamageDetails.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/DamageDetails.xml
@@ -9,7 +9,10 @@
left join pp.reporting_work as b
on a.reporting_work_id = b.reporting_work_id
left join patch_log as c
- on a.reporting_work_id = c.reporting_work_id and a.process_id = c.process_id and a.order_number = c.order_sort
+ on a.reporting_work_id = c.reporting_work_id
+ and a.process_id = c.process_id
+ and a.order_number = c.order_sort
+ and a.technology_number = c.technology_number
WHERE a.process_id = #{processId}
<if test="needOrderNumber!=null">
and a.order_number = #{orderNumber}
@@ -25,7 +28,7 @@
SELECT REGEXP_SUBSTR(#{behindProcess}, '[^,]+', 1, n) AS process
FROM cte
WHERE REGEXP_SUBSTR(#{behindProcess}, '[^,]+', 1, n) IS NOT NULL)
- and c.review_status = 0
+ and ifnull(c.review_status,0) = 0
</select>
<select id="getNotReview">
--
Gitblit v1.8.0