From fa32e887b8fdcd4a2bc3326306cbc558e119a9bb Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 01 八月 2024 10:00:33 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/Report.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 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 c1b1269..340de15 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -1229,7 +1229,7 @@
) AS pd ON pd.prod_id = od.product_id
AND pd.glass_sort = rwd.technology_number
where rw.reviewed_state=1 and rw.reporting_work_time between #{selectTime1} and #{selectTime2}
- and rw.this_process=#{selectProcesses}
+ and position(#{selectProcesses} in rw.this_process)
<if test="teamOutputDTO.thisProcess != null and teamOutputDTO.thisProcess != ''">
and rw.this_process regexp #{teamOutputDTO.thisProcess}
</if>
@@ -1265,8 +1265,8 @@
<select id="teamOutputPageTotal">
SELECT
- CEILING(count(rw.reporting_work_id)/#{pageSize}) as 'pageTotal',
- count(distinct rw.reporting_work_id) as 'total'
+ CEILING(count(rwd.id)/#{pageSize}) as 'pageTotal',
+ count(distinct rwd.id) as 'total'
FROM
reporting_work AS rw
LEFT JOIN reporting_work_detail AS rwd ON rw.reporting_work_id = rwd.reporting_work_id
@@ -1289,7 +1289,7 @@
) AS pd ON pd.prod_id = od.product_id
AND pd.glass_sort = rwd.technology_number
where rw.reviewed_state=1 and rw.reporting_work_time between #{selectTime1} and #{selectTime2}
- and rw.this_process=#{selectProcesses}
+ and position(#{selectProcesses} in rw.this_process)
<if test="teamOutputDTO.thisProcess != null and teamOutputDTO.thisProcess != ''">
and rw.this_process regexp #{teamOutputDTO.thisProcess}
</if>
--
Gitblit v1.8.0