From 21eed4f6a8065bb59d0aaf7481dfe145dba74f2a Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 01 十二月 2025 09:18:01 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/ReworkMapper.xml | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/pp/ReworkMapper.xml b/north-glass-erp/src/main/resources/mapper/pp/ReworkMapper.xml
index 97a9760..996eb69 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReworkMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReworkMapper.xml
@@ -51,7 +51,7 @@
and r.rework_id regexp #{rework.reworkId}
</if>
<if test="rework.reworkTeam != null and rework.reworkTeam != ''">
- and r.rework_team regexp #{rework.reworkTeam}
+ and r.rework_team like concat('%', #{rework.reworkTeam}, '%')
</if>
<if test="rework.orderId != null and rework.orderId != ''">
and r.order_id regexp #{rework.orderId}
@@ -99,7 +99,7 @@
and ogd.glass_address regexp #{rework.glassAddress}
</if>
<if test="rework.responsibleTeam != null and rework.responsibleTeam != ''">
- and r.responsible_team regexp #{rework.responsibleTeam}
+ and r.responsible_team like concat('%', #{rework.responsibleTeam}, '%')
</if>
<if test="rework.responsibleEquipment != null and rework.responsibleEquipment != ''">
and r.responsible_equipment regexp #{rework.responsibleEquipment}
@@ -123,7 +123,7 @@
and r.rework_processes regexp #{rework.reworkProcesses}
</if>
<if test="rework.reviewer != null and rework.reviewer != ''">
- and r.reviewer regexp #{rework.reviewer}
+ and r.reviewer like concat('%', #{rework.reviewer}, '%')
</if>
</where>
order by r.review_status,r.id desc limit #{offset},#{pageSize};
@@ -145,7 +145,7 @@
and r.rework_id regexp #{rework.reworkId}
</if>
<if test="rework.reworkTeam != null and rework.reworkTeam != ''">
- and r.rework_team regexp #{rework.reworkTeam}
+ and r.rework_team like concat('%', #{rework.reworkTeam}, '%')
</if>
<if test="rework.orderId != null and rework.orderId != ''">
and r.order_id regexp #{rework.orderId}
@@ -193,7 +193,7 @@
and ogd.glass_address regexp #{rework.glassAddress}
</if>
<if test="rework.responsibleTeam != null and rework.responsibleTeam != ''">
- and r.responsible_team regexp #{rework.responsibleTeam}
+ and r.responsible_team like concat('%', #{rework.responsibleTeam}, '%')
</if>
<if test="rework.responsibleEquipment != null and rework.responsibleEquipment != ''">
and r.responsible_equipment regexp #{rework.responsibleEquipment}
@@ -217,7 +217,7 @@
and r.rework_processes regexp #{rework.reworkProcesses}
</if>
<if test="rework.reviewer != null and rework.reviewer != ''">
- and r.reviewer regexp #{rework.reviewer}
+ and r.reviewer like concat('%', #{rework.reviewer}, '%')
</if>
</where>
) as zu;
--
Gitblit v1.8.0