From b70ea28f51757ed39992d5a71b2e15b1d4cc7c7d Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 27 十一月 2025 16:21:45 +0800
Subject: [PATCH] xml中筛选条件匹配方法修改
---
north-glass-erp/src/main/resources/mapper/pp/Report.xml | 268 +++++++++++++++++++++++++++++++---------------------
1 files changed, 159 insertions(+), 109 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/pp/Report.xml b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
index acd6a17..ac3f054 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -293,43 +293,43 @@
and rw.this_process != dd.responsible_process
and o.create_order>0
<if test="crossProcessBreakingDTO.code != null and crossProcessBreakingDTO.code != ''">
- and JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) regexp #{crossProcessBreakingDTO.code}
+ and JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) like concat('%', #{crossProcessBreakingDTO.code}, '%')
</if>
<if test="crossProcessBreakingDTO.processId != null and crossProcessBreakingDTO.processId != ''">
- and rw.process_id regexp #{crossProcessBreakingDTO.processId}
+ and rw.process_id like concat('%', #{crossProcessBreakingDTO.processId}, '%')
</if>
<if test="crossProcessBreakingDTO.thisProcess != null and crossProcessBreakingDTO.thisProcess != ''">
- and rw.this_process regexp #{crossProcessBreakingDTO.thisProcess}
+ and rw.this_process like concat('%', #{crossProcessBreakingDTO.thisProcess}, '%')
</if>
<if test="crossProcessBreakingDTO.responsibleProcess != null and crossProcessBreakingDTO.responsibleProcess != ''">
- and dd.responsible_process regexp #{crossProcessBreakingDTO.responsibleProcess}
+ and dd.responsible_process like concat('%', #{crossProcessBreakingDTO.responsibleProcess}, '%')
</if>
<if test="crossProcessBreakingDTO.responsibleTeam != null and crossProcessBreakingDTO.responsibleTeam != ''">
- and dd.responsible_team regexp #{crossProcessBreakingDTO.responsibleTeam}
+ and dd.responsible_team like concat('%', #{crossProcessBreakingDTO.responsibleTeam}, '%')
</if>
<if test="crossProcessBreakingDTO.glassChild != null and crossProcessBreakingDTO.glassChild != ''">
- and ogd.glass_child regexp #{crossProcessBreakingDTO.glassChild}
+ and ogd.glass_child like concat('%', #{crossProcessBreakingDTO.glassChild}, '%')
</if>
<if test="crossProcessBreakingDTO.breakageType != null and crossProcessBreakingDTO.breakageType != ''">
- and dd.breakage_type regexp #{crossProcessBreakingDTO.breakageType}
+ and dd.breakage_type like concat('%', #{crossProcessBreakingDTO.breakageType}, '%')
</if>
<if test="crossProcessBreakingDTO.project != null and crossProcessBreakingDTO.project != ''">
- and o.project regexp #{crossProcessBreakingDTO.project}
+ and o.project like concat('%', #{crossProcessBreakingDTO.project}, '%')
</if>
<if test="crossProcessBreakingDTO.orderId != null and crossProcessBreakingDTO.orderId != ''">
- and o.order_id regexp #{crossProcessBreakingDTO.orderId}
+ and o.order_id like concat('%', #{crossProcessBreakingDTO.orderId}, '%')
</if>
<if test="crossProcessBreakingDTO.responsiblePersonnel != null and crossProcessBreakingDTO.responsiblePersonnel != ''">
- and dd.responsible_personnel regexp #{crossProcessBreakingDTO.responsiblePersonnel}
+ and dd.responsible_personnel like concat('%', #{crossProcessBreakingDTO.responsiblePersonnel}, '%')
</if>
<if test="crossProcessBreakingDTO.creator != null and crossProcessBreakingDTO.creator != ''">
- and rw.creator regexp #{crossProcessBreakingDTO.creator}
+ and rw.creator like concat('%', #{crossProcessBreakingDTO.creator}, '%')
</if>
<if test="crossProcessBreakingDTO.code != null and crossProcessBreakingDTO.code != ''">
- and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') regexp #{crossProcessBreakingDTO.code}
+ and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') like concat('%', #{crossProcessBreakingDTO.code}, '%')
</if>
<if test="crossProcessBreakingDTO.reportingWorkId != null and crossProcessBreakingDTO.reportingWorkId != ''">
- and rw.reporting_work_id regexp #{crossProcessBreakingDTO.reportingWorkId}
+ and rw.reporting_work_id like concat('%', #{crossProcessBreakingDTO.reportingWorkId}, '%')
</if>
GROUP BY dd.id
order by dd.id desc
@@ -369,43 +369,43 @@
and rw.this_process = dd.responsible_process
and o.create_order>0
<if test="crossProcessBreakingDTO.code != null and crossProcessBreakingDTO.code != ''">
- and JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) regexp #{crossProcessBreakingDTO.code}
+ and JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) like concat('%', #{crossProcessBreakingDTO.code}, '%')
</if>
<if test="crossProcessBreakingDTO.processId != null and crossProcessBreakingDTO.processId != ''">
- and rw.process_id regexp #{crossProcessBreakingDTO.processId}
+ and rw.process_id like concat('%', #{crossProcessBreakingDTO.processId}, '%')
</if>
<if test="crossProcessBreakingDTO.thisProcess != null and crossProcessBreakingDTO.thisProcess != ''">
- and rw.this_process regexp #{crossProcessBreakingDTO.thisProcess}
+ and rw.this_process like concat('%', #{crossProcessBreakingDTO.thisProcess}, '%')
</if>
<if test="crossProcessBreakingDTO.responsibleProcess != null and crossProcessBreakingDTO.responsibleProcess != ''">
- and dd.responsible_process regexp #{crossProcessBreakingDTO.responsibleProcess}
+ and dd.responsible_process like concat('%', #{crossProcessBreakingDTO.responsibleProcess}, '%')
</if>
<if test="crossProcessBreakingDTO.responsibleTeam != null and crossProcessBreakingDTO.responsibleTeam != ''">
- and dd.responsible_team regexp #{crossProcessBreakingDTO.responsibleTeam}
+ and dd.responsible_team like concat('%', #{crossProcessBreakingDTO.responsibleTeam}, '%')
</if>
<if test="crossProcessBreakingDTO.glassChild != null and crossProcessBreakingDTO.glassChild != ''">
- and ogd.glass_child regexp #{crossProcessBreakingDTO.glassChild}
+ and ogd.glass_child like concat('%', #{crossProcessBreakingDTO.glassChild}, '%')
</if>
<if test="crossProcessBreakingDTO.breakageType != null and crossProcessBreakingDTO.breakageType != ''">
- and dd.breakage_type regexp #{crossProcessBreakingDTO.breakageType}
+ and dd.breakage_type like concat('%', #{crossProcessBreakingDTO.breakageType}, '%')
</if>
<if test="crossProcessBreakingDTO.project != null and crossProcessBreakingDTO.project != ''">
- and o.project regexp #{crossProcessBreakingDTO.project}
+ and o.project like concat('%', #{crossProcessBreakingDTO.project}, '%')
</if>
<if test="crossProcessBreakingDTO.orderId != null and crossProcessBreakingDTO.orderId != ''">
- and o.order_id regexp #{crossProcessBreakingDTO.orderId}
+ and o.order_id like concat('%', #{crossProcessBreakingDTO.orderId}, '%')
</if>
<if test="crossProcessBreakingDTO.responsiblePersonnel != null and crossProcessBreakingDTO.responsiblePersonnel != ''">
- and dd.responsible_personnel regexp #{crossProcessBreakingDTO.responsiblePersonnel}
+ and dd.responsible_personnel like concat('%', #{crossProcessBreakingDTO.responsiblePersonnel}, '%')
</if>
<if test="crossProcessBreakingDTO.creator != null and crossProcessBreakingDTO.creator != ''">
- and rw.creator regexp #{crossProcessBreakingDTO.creator}
+ and rw.creator like concat('%', #{crossProcessBreakingDTO.creator}, '%')
</if>
<if test="crossProcessBreakingDTO.code != null and crossProcessBreakingDTO.code != ''">
- and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') regexp #{crossProcessBreakingDTO.code}
+ and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') like concat('%', #{crossProcessBreakingDTO.code}, '%')
</if>
<if test="crossProcessBreakingDTO.reportingWorkId != null and crossProcessBreakingDTO.reportingWorkId != ''">
- and rw.reporting_work_id regexp #{crossProcessBreakingDTO.reportingWorkId}
+ and rw.reporting_work_id like concat('%', #{crossProcessBreakingDTO.reportingWorkId}, '%')
</if>
GROUP BY dd.id
order by dd.id desc
@@ -431,40 +431,43 @@
and rw.reviewed_state>=0
and rw.this_process != dd.responsible_process
<if test="crossProcessBreakingDTO.code != null and crossProcessBreakingDTO.code != ''">
- and JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) regexp #{crossProcessBreakingDTO.code}
+ and JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) like concat('%', #{crossProcessBreakingDTO.code}, '%')
</if>
<if test="crossProcessBreakingDTO.processId != null and crossProcessBreakingDTO.processId != ''">
- and rw.process_id regexp #{crossProcessBreakingDTO.processId}
+ and rw.process_id like concat('%', #{crossProcessBreakingDTO.processId}, '%')
</if>
<if test="crossProcessBreakingDTO.thisProcess != null and crossProcessBreakingDTO.thisProcess != ''">
- and rw.this_process regexp #{crossProcessBreakingDTO.thisProcess}
+ and rw.this_process like concat('%', #{crossProcessBreakingDTO.thisProcess}, '%')
</if>
<if test="crossProcessBreakingDTO.responsibleProcess != null and crossProcessBreakingDTO.responsibleProcess != ''">
- and dd.responsible_process regexp #{crossProcessBreakingDTO.responsibleProcess}
+ and dd.responsible_process like concat('%', #{crossProcessBreakingDTO.responsibleProcess}, '%')
</if>
<if test="crossProcessBreakingDTO.responsibleTeam != null and crossProcessBreakingDTO.responsibleTeam != ''">
- and dd.responsible_team regexp #{crossProcessBreakingDTO.responsibleTeam}
+ and dd.responsible_team like concat('%', #{crossProcessBreakingDTO.responsibleTeam}, '%')
</if>
<if test="crossProcessBreakingDTO.glassChild != null and crossProcessBreakingDTO.glassChild != ''">
- and ogd.glass_child regexp #{crossProcessBreakingDTO.glassChild}
+ and ogd.glass_child like concat('%', #{crossProcessBreakingDTO.glassChild}, '%')
</if>
<if test="crossProcessBreakingDTO.breakageType != null and crossProcessBreakingDTO.breakageType != ''">
- and dd.breakage_type regexp #{crossProcessBreakingDTO.breakageType}
+ and dd.breakage_type like concat('%', #{crossProcessBreakingDTO.breakageType}, '%')
</if>
<if test="crossProcessBreakingDTO.project != null and crossProcessBreakingDTO.project != ''">
- and o.project regexp #{crossProcessBreakingDTO.project}
+ and o.project like concat('%', #{crossProcessBreakingDTO.project}, '%')
</if>
<if test="crossProcessBreakingDTO.orderId != null and crossProcessBreakingDTO.orderId != ''">
- and o.order_id regexp #{crossProcessBreakingDTO.orderId}
+ and o.order_id like concat('%', #{crossProcessBreakingDTO.orderId}, '%')
</if>
<if test="crossProcessBreakingDTO.responsiblePersonnel != null and crossProcessBreakingDTO.responsiblePersonnel != ''">
- and dd.responsible_personnel regexp #{crossProcessBreakingDTO.responsiblePersonnel}
+ and dd.responsible_personnel like concat('%', #{crossProcessBreakingDTO.responsiblePersonnel}, '%')
+ </if>
+ <if test="crossProcessBreakingDTO.creator != null and crossProcessBreakingDTO.creator != ''">
+ and rw.creator like concat('%', #{crossProcessBreakingDTO.creator}, '%')
</if>
<if test="crossProcessBreakingDTO.code != null and crossProcessBreakingDTO.code != ''">
- and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') regexp #{crossProcessBreakingDTO.code}
+ and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') like concat('%', #{crossProcessBreakingDTO.code}, '%')
</if>
<if test="crossProcessBreakingDTO.reportingWorkId != null and crossProcessBreakingDTO.reportingWorkId != ''">
- and rw.reporting_work_id regexp #{crossProcessBreakingDTO.reportingWorkId}
+ and rw.reporting_work_id like concat('%', #{crossProcessBreakingDTO.reportingWorkId}, '%')
</if>
order by dd.id desc
</select>
@@ -488,37 +491,43 @@
and reviewed_state != 2
and rw.this_process = dd.responsible_process
<if test="crossProcessBreakingDTO.code != null and crossProcessBreakingDTO.code != ''">
- and JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) regexp #{crossProcessBreakingDTO.code}
+ and JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) like concat('%', #{crossProcessBreakingDTO.code}, '%')
</if>
<if test="crossProcessBreakingDTO.processId != null and crossProcessBreakingDTO.processId != ''">
- and rw.process_id regexp #{crossProcessBreakingDTO.processId}
+ and rw.process_id like concat('%', #{crossProcessBreakingDTO.processId}, '%')
</if>
<if test="crossProcessBreakingDTO.thisProcess != null and crossProcessBreakingDTO.thisProcess != ''">
- and rw.this_process regexp #{crossProcessBreakingDTO.thisProcess}
+ and rw.this_process like concat('%', #{crossProcessBreakingDTO.thisProcess}, '%')
</if>
<if test="crossProcessBreakingDTO.responsibleProcess != null and crossProcessBreakingDTO.responsibleProcess != ''">
- and dd.responsible_process regexp #{crossProcessBreakingDTO.responsibleProcess}
+ and dd.responsible_process like concat('%', #{crossProcessBreakingDTO.responsibleProcess}, '%')
</if>
<if test="crossProcessBreakingDTO.responsibleTeam != null and crossProcessBreakingDTO.responsibleTeam != ''">
- and dd.responsible_team regexp #{crossProcessBreakingDTO.responsibleTeam}
+ and dd.responsible_team like concat('%', #{crossProcessBreakingDTO.responsibleTeam}, '%')
</if>
<if test="crossProcessBreakingDTO.glassChild != null and crossProcessBreakingDTO.glassChild != ''">
- and ogd.glass_child regexp #{crossProcessBreakingDTO.glassChild}
+ and ogd.glass_child like concat('%', #{crossProcessBreakingDTO.glassChild}, '%')
</if>
<if test="crossProcessBreakingDTO.breakageType != null and crossProcessBreakingDTO.breakageType != ''">
- and dd.breakage_type regexp #{crossProcessBreakingDTO.breakageType}
+ and dd.breakage_type like concat('%', #{crossProcessBreakingDTO.breakageType}, '%')
</if>
<if test="crossProcessBreakingDTO.project != null and crossProcessBreakingDTO.project != ''">
- and o.project regexp #{crossProcessBreakingDTO.project}
+ and o.project like concat('%', #{crossProcessBreakingDTO.project}, '%')
</if>
<if test="crossProcessBreakingDTO.orderId != null and crossProcessBreakingDTO.orderId != ''">
- and o.order_id regexp #{crossProcessBreakingDTO.orderId}
+ and o.order_id like concat('%', #{crossProcessBreakingDTO.orderId}, '%')
</if>
<if test="crossProcessBreakingDTO.responsiblePersonnel != null and crossProcessBreakingDTO.responsiblePersonnel != ''">
- and dd.responsible_personnel regexp #{crossProcessBreakingDTO.responsiblePersonnel}
+ and dd.responsible_personnel like concat('%', #{crossProcessBreakingDTO.responsiblePersonnel}, '%')
+ </if>
+ <if test="crossProcessBreakingDTO.creator != null and crossProcessBreakingDTO.creator != ''">
+ and rw.creator like concat('%', #{crossProcessBreakingDTO.creator}, '%')
</if>
<if test="crossProcessBreakingDTO.code != null and crossProcessBreakingDTO.code != ''">
- and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') regexp #{crossProcessBreakingDTO.code}
+ and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') like concat('%', #{crossProcessBreakingDTO.code}, '%')
+ </if>
+ <if test="crossProcessBreakingDTO.reportingWorkId != null and crossProcessBreakingDTO.reportingWorkId != ''">
+ and rw.reporting_work_id like concat('%', #{crossProcessBreakingDTO.reportingWorkId}, '%')
</if>
order by dd.id desc
</select>
@@ -792,49 +801,49 @@
AND dd.available = 0 and rw.reviewed_state>=0
<if test="damageReportDTO.orderId != null and damageReportDTO.orderId != ''">
- and o.order_id regexp #{damageReportDTO.orderId}
+ and o.order_id like concat('%', #{damageReportDTO.orderId}, '%')
</if>
<if test="damageReportDTO.project != null and damageReportDTO.project != ''">
- and o.project regexp #{damageReportDTO.project}
+ and o.project like concat('%', #{damageReportDTO.project}, '%')
</if>
<if test="damageReportDTO.processId != null and damageReportDTO.processId != ''">
- and rw.process_id regexp #{damageReportDTO.processId}
+ and rw.process_id like concat('%', #{damageReportDTO.processId}, '%')
</if>
<if test="damageReportDTO.orderNumber != null and damageReportDTO.orderNumber != ''">
- and dd.order_number regexp #{damageReportDTO.orderNumber}
+ and dd.order_number like concat('%', #{damageReportDTO.orderNumber}, '%')
</if>
<if test="damageReportDTO.technologyNumber != null and damageReportDTO.technologyNumber != ''">
- and dd.technology_number regexp #{damageReportDTO.technologyNumber}
+ and dd.technology_number like concat('%', #{damageReportDTO.technologyNumber}, '%')
</if>
<if test="damageReportDTO.responsibleProcess != null and damageReportDTO.responsibleProcess != ''">
- and dd.responsible_process regexp #{damageReportDTO.responsibleProcess}
+ and dd.responsible_process like concat('%', #{damageReportDTO.responsibleProcess}, '%')
</if>
<if test="damageReportDTO.responsibleTeam != null and damageReportDTO.responsibleTeam != ''">
- and dd.responsible_team regexp #{damageReportDTO.responsibleTeam}
+ and dd.responsible_team like concat('%', #{damageReportDTO.responsibleTeam}, '%')
</if>
<if test="damageReportDTO.responsibleEquipment != null and damageReportDTO.responsibleEquipment != ''">
- and dd.responsible_equipment regexp #{damageReportDTO.responsibleEquipment}
+ and dd.responsible_equipment like concat('%', #{damageReportDTO.responsibleEquipment}, '%')
</if>
<if test="damageReportDTO.breakageType != null and damageReportDTO.breakageType != ''">
- and dd.breakage_type regexp #{damageReportDTO.breakageType}
+ and dd.breakage_type like concat('%', #{damageReportDTO.breakageType}, '%')
</if>
<if test="damageReportDTO.breakageReason != null and damageReportDTO.breakageReason != ''">
- and dd.breakage_reason regexp #{damageReportDTO.breakageReason}
+ and dd.breakage_reason like concat('%', #{damageReportDTO.breakageReason}, '%')
</if>
<if test="damageReportDTO.glassChild != null and damageReportDTO.glassChild != ''">
- and ogd.glass_child regexp #{damageReportDTO.glassChild}
+ and ogd.glass_child like concat('%', #{damageReportDTO.glassChild}, '%')
</if>
<if test="damageReportDTO.glassNumber != null and damageReportDTO.glassNumber != ''">
- and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') regexp #{damageReportDTO.glassNumber}
+ and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') like concat('%', #{damageReportDTO.glassNumber}, '%')
</if>
<if test="damageReportDTO.thisProcess != null and damageReportDTO.thisProcess != ''">
- and rw.this_process regexp #{damageReportDTO.thisProcess}
+ and rw.this_process like concat('%', #{damageReportDTO.thisProcess}, '%')
</if>
<if test="damageReportDTO.creator != null and damageReportDTO.creator != ''">
- and rw.creator regexp #{damageReportDTO.creator}
+ and rw.creator like concat('%', #{damageReportDTO.creator}, '%')
</if>
<if test="damageReportDTO.reportingWorkId != null and damageReportDTO.reportingWorkId != ''">
- and rw.reporting_work_id regexp #{damageReportDTO.reportingWorkId}
+ and rw.reporting_work_id like concat('%', #{damageReportDTO.reportingWorkId}, '%')
</if>
GROUP BY
dd.id
@@ -852,42 +861,55 @@
LEFT JOIN pp.damage_details AS dd ON dd.reporting_work_id = rw.reporting_work_id
AND dd.order_number = ogd.order_number
AND dd.technology_number = ogd.technology_number
+ left join sd.order_detail as od on o.order_id = od.order_id and od.order_number=ogd.order_number
WHERE
rw.reporting_work_time >= #{selectTime1}
AND rw.reporting_work_time <= #{selectTime2}
AND dd.available = 0 and rw.reviewed_state>=0
<if test="damageReportDTO.orderId != null and damageReportDTO.orderId != ''">
- and o.order_id regexp #{damageReportDTO.orderId}
+ and o.order_id like concat('%', #{damageReportDTO.orderId}, '%')
</if>
<if test="damageReportDTO.project != null and damageReportDTO.project != ''">
- and o.project regexp #{damageReportDTO.project}
+ and o.project like concat('%', #{damageReportDTO.project}, '%')
</if>
<if test="damageReportDTO.processId != null and damageReportDTO.processId != ''">
- and rw.process_id regexp #{damageReportDTO.processId}
+ and rw.process_id like concat('%', #{damageReportDTO.processId}, '%')
</if>
<if test="damageReportDTO.orderNumber != null and damageReportDTO.orderNumber != ''">
- and dd.order_number regexp #{damageReportDTO.orderNumber}
+ and dd.order_number like concat('%', #{damageReportDTO.orderNumber}, '%')
</if>
<if test="damageReportDTO.technologyNumber != null and damageReportDTO.technologyNumber != ''">
- and dd.technology_number regexp #{damageReportDTO.technologyNumber}
+ and dd.technology_number like concat('%', #{damageReportDTO.technologyNumber}, '%')
</if>
<if test="damageReportDTO.responsibleProcess != null and damageReportDTO.responsibleProcess != ''">
- and dd.responsible_process regexp #{damageReportDTO.responsibleProcess}
+ and dd.responsible_process like concat('%', #{damageReportDTO.responsibleProcess}, '%')
</if>
<if test="damageReportDTO.responsibleTeam != null and damageReportDTO.responsibleTeam != ''">
- and dd.responsible_team regexp #{damageReportDTO.responsibleTeam}
+ and dd.responsible_team like concat('%', #{damageReportDTO.responsibleTeam}, '%')
</if>
<if test="damageReportDTO.responsibleEquipment != null and damageReportDTO.responsibleEquipment != ''">
- and dd.responsible_equipment regexp #{damageReportDTO.responsibleEquipment}
+ and dd.responsible_equipment like concat('%', #{damageReportDTO.responsibleEquipment}, '%')
</if>
<if test="damageReportDTO.breakageType != null and damageReportDTO.breakageType != ''">
- and dd.breakage_type regexp #{damageReportDTO.breakageType}
+ and dd.breakage_type like concat('%', #{damageReportDTO.breakageType}, '%')
</if>
<if test="damageReportDTO.breakageReason != null and damageReportDTO.breakageReason != ''">
- and dd.breakage_reason regexp #{damageReportDTO.breakageReason}
+ and dd.breakage_reason like concat('%', #{damageReportDTO.breakageReason}, '%')
</if>
<if test="damageReportDTO.glassChild != null and damageReportDTO.glassChild != ''">
- and ogd.glass_child regexp #{damageReportDTO.glassChild}
+ and ogd.glass_child like concat('%', #{damageReportDTO.glassChild}, '%')
+ </if>
+ <if test="damageReportDTO.glassNumber != null and damageReportDTO.glassNumber != ''">
+ and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') like concat('%', #{damageReportDTO.glassNumber}, '%')
+ </if>
+ <if test="damageReportDTO.thisProcess != null and damageReportDTO.thisProcess != ''">
+ and rw.this_process like concat('%', #{damageReportDTO.thisProcess}, '%')
+ </if>
+ <if test="damageReportDTO.creator != null and damageReportDTO.creator != ''">
+ and rw.creator like concat('%', #{damageReportDTO.creator}, '%')
+ </if>
+ <if test="damageReportDTO.reportingWorkId != null and damageReportDTO.reportingWorkId != ''">
+ and rw.reporting_work_id like concat('%', #{damageReportDTO.reportingWorkId}, '%')
</if>
limit #{offset},#{pageSize};
</select>
@@ -2478,29 +2500,48 @@
<if test="terminationVals != '1' and terminationVals != 1">
and fc.termination_status !=1
</if>
+ <if test="workInProgressDTO.thisProcess != null and workInProgressDTO.thisProcess != ''">
+ and d.process like concat('%', #{workInProgressDTO.thisProcess}, '%')
+ </if>
<if test="workInProgressDTO.customerName != null and workInProgressDTO.customerName != ''">
- and o.customer_name regexp #{workInProgressDTO.customerName}
+ and o.customer_name like concat('%', #{workInProgressDTO.customerName}, '%')
</if>
<if test="workInProgressDTO.project != null and workInProgressDTO.project != ''">
- and o.project regexp #{workInProgressDTO.project}
+ and o.project like concat('%', #{workInProgressDTO.project}, '%')
</if>
<if test="workInProgressDTO.orderId != null and workInProgressDTO.orderId != ''">
- and o.order_id regexp #{workInProgressDTO.orderId}
+ and o.order_id like concat('%', #{workInProgressDTO.orderId}, '%')
</if>
<if test="workInProgressDTO.batch != null and workInProgressDTO.batch != ''">
- and o.batch regexp #{workInProgressDTO.batch}
+ and o.batch like concat('%', #{workInProgressDTO.batch}, '%')
</if>
<if test="workInProgressDTO.processId != null and workInProgressDTO.processId != ''">
- and fc.process_id regexp #{workInProgressDTO.processId}
+ and fc.process_id like concat('%', #{workInProgressDTO.processId}, '%')
</if>
<if test="workInProgressDTO.orderNumber != null and workInProgressDTO.orderNumber != ''">
- and ogd.order_number regexp #{workInProgressDTO.orderNumber}
+ and ogd.order_number like concat('%', #{workInProgressDTO.orderNumber}, '%')
</if>
<if test="workInProgressDTO.technologyNumber != null and workInProgressDTO.technologyNumber != ''">
- and ogd.technology_number regexp #{workInProgressDTO.technologyNumber}
+ and ogd.technology_number like concat('%', #{workInProgressDTO.technologyNumber}, '%')
+ </if>
+ <if test="workInProgressDTO.quantity != null and workInProgressDTO.quantity != ''">
+ and od.quantity like concat('%', #{workInProgressDTO.quantity}, '%')
+ </if>
+ <if test="workInProgressDTO.childWidth != null and workInProgressDTO.childWidth != ''">
+ and ogd.child_width regexp REGEXP_REPLACE(#{workInProgressDTO.childWidth},'\\.0+$','')
+ </if>
+ <if test="workInProgressDTO.childHeight != null and workInProgressDTO.childHeight != ''">
+ and ogd.child_height regexp REGEXP_REPLACE(#{workInProgressDTO.childHeight},'\\.0+$','')
+ </if>
+ <if test="workInProgressDTO.stockNum != null and workInProgressDTO.stockNum != ''">
+ and (d.numCounts + d.patchNumSum - d.numCount -d.broken_num) like concat('%', #{workInProgressDTO.stockNum}, '%')
+ </if>
+ <if test="workInProgressDTO.stockArea != null and workInProgressDTO.stockArea != ''">
+ and ROUND(ogd.child_width * ogd.child_height * (d.numCounts + d.patchNumSum - d.numCount -
+ d.broken_num) / 1000000, 2) regexp REGEXP_REPLACE(#{workInProgressDTO.stockArea},'\\.0+$','')
</if>
<if test="workInProgressDTO.glassNumber != null and workInProgressDTO.glassNumber != ''">
- and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') regexp #{workInProgressDTO.glassNumber}
+ and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') like concat('%', #{workInProgressDTO.glassNumber}, '%')
</if>
group by fc.process_id, fc.order_number, fc.technology_number,d.process
@@ -2561,40 +2602,49 @@
AND rw.reporting_work_time <= #{selectTime2}
AND dd.available = 0 and rw.reviewed_state>=0
<if test="damageReportDTO.orderId != null and damageReportDTO.orderId != ''">
- and o.order_id regexp #{damageReportDTO.orderId}
+ and o.order_id like concat('%', #{damageReportDTO.orderId}, '%')
</if>
<if test="damageReportDTO.project != null and damageReportDTO.project != ''">
- and o.project regexp #{damageReportDTO.project}
+ and o.project like concat('%', #{damageReportDTO.project}, '%')
</if>
<if test="damageReportDTO.processId != null and damageReportDTO.processId != ''">
- and rw.process_id regexp #{damageReportDTO.processId}
+ and rw.process_id like concat('%', #{damageReportDTO.processId}, '%')
</if>
<if test="damageReportDTO.orderNumber != null and damageReportDTO.orderNumber != ''">
- and dd.order_number regexp #{damageReportDTO.orderNumber}
+ and dd.order_number like concat('%', #{damageReportDTO.orderNumber}, '%')
</if>
<if test="damageReportDTO.technologyNumber != null and damageReportDTO.technologyNumber != ''">
- and dd.technology_number regexp #{damageReportDTO.technologyNumber}
+ and dd.technology_number like concat('%', #{damageReportDTO.technologyNumber}, '%')
</if>
<if test="damageReportDTO.responsibleProcess != null and damageReportDTO.responsibleProcess != ''">
- and dd.responsible_process regexp #{damageReportDTO.responsibleProcess}
+ and dd.responsible_process like concat('%', #{damageReportDTO.responsibleProcess}, '%')
</if>
<if test="damageReportDTO.responsibleTeam != null and damageReportDTO.responsibleTeam != ''">
- and dd.responsible_team regexp #{damageReportDTO.responsibleTeam}
+ and dd.responsible_team like concat('%', #{damageReportDTO.responsibleTeam}, '%')
</if>
<if test="damageReportDTO.responsibleEquipment != null and damageReportDTO.responsibleEquipment != ''">
- and dd.responsible_equipment regexp #{damageReportDTO.responsibleEquipment}
+ and dd.responsible_equipment like concat('%', #{damageReportDTO.responsibleEquipment}, '%')
</if>
<if test="damageReportDTO.breakageType != null and damageReportDTO.breakageType != ''">
- and dd.breakage_type regexp #{damageReportDTO.breakageType}
+ and dd.breakage_type like concat('%', #{damageReportDTO.breakageType}, '%')
</if>
<if test="damageReportDTO.breakageReason != null and damageReportDTO.breakageReason != ''">
- and dd.breakage_reason regexp #{damageReportDTO.breakageReason}
+ and dd.breakage_reason like concat('%', #{damageReportDTO.breakageReason}, '%')
</if>
<if test="damageReportDTO.glassChild != null and damageReportDTO.glassChild != ''">
- and ogd.glass_child regexp #{damageReportDTO.glassChild}
+ and ogd.glass_child like concat('%', #{damageReportDTO.glassChild}, '%')
</if>
<if test="damageReportDTO.glassNumber != null and damageReportDTO.glassNumber != ''">
- and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') regexp #{damageReportDTO.glassNumber}
+ and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') like concat('%', #{damageReportDTO.glassNumber}, '%')
+ </if>
+ <if test="damageReportDTO.thisProcess != null and damageReportDTO.thisProcess != ''">
+ and rw.this_process like concat('%', #{damageReportDTO.thisProcess}, '%')
+ </if>
+ <if test="damageReportDTO.creator != null and damageReportDTO.creator != ''">
+ and rw.creator like concat('%', #{damageReportDTO.creator}, '%')
+ </if>
+ <if test="damageReportDTO.reportingWorkId != null and damageReportDTO.reportingWorkId != ''">
+ and rw.reporting_work_id like concat('%', #{damageReportDTO.reportingWorkId}, '%')
</if>
</select>
@@ -2843,47 +2893,47 @@
and fc.termination_status !=1
</if>
<if test="workInProgressDTO.thisProcess != null and workInProgressDTO.thisProcess != ''">
- and d.process regexp #{workInProgressDTO.thisProcess}
+ and d.process like concat('%', #{workInProgressDTO.thisProcess}, '%')
</if>
<if test="workInProgressDTO.customerName != null and workInProgressDTO.customerName != ''">
- and o.customer_name regexp #{workInProgressDTO.customerName}
+ and o.customer_name like concat('%', #{workInProgressDTO.customerName}, '%')
</if>
<if test="workInProgressDTO.project != null and workInProgressDTO.project != ''">
- and o.project regexp #{workInProgressDTO.project}
+ and o.project like concat('%', #{workInProgressDTO.project}, '%')
</if>
<if test="workInProgressDTO.orderId != null and workInProgressDTO.orderId != ''">
- and o.order_id regexp #{workInProgressDTO.orderId}
+ and o.order_id like concat('%', #{workInProgressDTO.orderId}, '%')
</if>
<if test="workInProgressDTO.batch != null and workInProgressDTO.batch != ''">
- and o.batch regexp #{workInProgressDTO.batch}
+ and o.batch like concat('%', #{workInProgressDTO.batch}, '%')
</if>
<if test="workInProgressDTO.processId != null and workInProgressDTO.processId != ''">
- and fc.process_id regexp #{workInProgressDTO.processId}
+ and fc.process_id like concat('%', #{workInProgressDTO.processId}, '%')
</if>
<if test="workInProgressDTO.orderNumber != null and workInProgressDTO.orderNumber != ''">
- and ogd.order_number regexp #{workInProgressDTO.orderNumber}
+ and ogd.order_number like concat('%', #{workInProgressDTO.orderNumber}, '%')
</if>
<if test="workInProgressDTO.technologyNumber != null and workInProgressDTO.technologyNumber != ''">
- and ogd.technology_number regexp #{workInProgressDTO.technologyNumber}
+ and ogd.technology_number like concat('%', #{workInProgressDTO.technologyNumber}, '%')
</if>
<if test="workInProgressDTO.quantity != null and workInProgressDTO.quantity != ''">
- and od.quantity regexp #{workInProgressDTO.quantity}
+ and od.quantity like concat('%', #{workInProgressDTO.quantity}, '%')
</if>
<if test="workInProgressDTO.childWidth != null and workInProgressDTO.childWidth != ''">
- and ogd.child_width regexp #{workInProgressDTO.childWidth}
+ and ogd.child_width regexp REGEXP_REPLACE(#{workInProgressDTO.childWidth},'\\.0+$','')
</if>
<if test="workInProgressDTO.childHeight != null and workInProgressDTO.childHeight != ''">
- and ogd.child_height regexp #{workInProgressDTO.childHeight}
+ and ogd.child_height regexp REGEXP_REPLACE(#{workInProgressDTO.childHeight},'\\.0+$','')
</if>
<if test="workInProgressDTO.stockNum != null and workInProgressDTO.stockNum != ''">
- and (d.numCounts + d.patchNumSum - d.numCount -d.broken_num) regexp #{workInProgressDTO.stockNum}
+ and (d.numCounts + d.patchNumSum - d.numCount -d.broken_num) like concat('%', #{workInProgressDTO.stockNum}, '%')
</if>
<if test="workInProgressDTO.stockArea != null and workInProgressDTO.stockArea != ''">
and ROUND(ogd.child_width * ogd.child_height * (d.numCounts + d.patchNumSum - d.numCount -
- d.broken_num) / 1000000, 2) regexp #{workInProgressDTO.stockArea}
+ d.broken_num) / 1000000, 2) regexp REGEXP_REPLACE(#{workInProgressDTO.stockArea},'\\.0+$','')
</if>
<if test="workInProgressDTO.glassNumber != null and workInProgressDTO.glassNumber != ''">
- and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') regexp #{workInProgressDTO.glassNumber}
+ and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') like concat('%', #{workInProgressDTO.glassNumber}, '%')
</if>
<choose>
<when test="laminating != null and laminating == 'stepC'">
--
Gitblit v1.8.0