From fd290b7ac3821bd2c3f7e1549c4af14ce3137be1 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 05 十二月 2025 09:33:16 +0800
Subject: [PATCH] 班组产量报表导出格式调整
---
north-glass-erp/src/main/resources/mapper/pp/Report.xml | 6 +++---
1 files changed, 3 insertions(+), 3 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 344adcb..898dad1 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -1840,7 +1840,7 @@
</if>
HAVING 1 = 1
<if test="teamOutputDTO.thicknessSum != null and teamOutputDTO.thicknessSum != ''">
- AND thicknessSum REGEXP #{teamOutputDTO.thicknessSum}
+ and thicknessSum regexp REGEXP_REPLACE(#{teamOutputDTO.thicknessSum},'\\.0+$','')
</if>
ORDER BY
t.this_process,
@@ -2106,7 +2106,7 @@
) x
WHERE 1 = 1
<if test="teamOutputDTO.thicknessSum != null and teamOutputDTO.thicknessSum != ''">
- AND x.thicknessSum REGEXP #{teamOutputDTO.thicknessSum}
+ and thicknessSum regexp REGEXP_REPLACE(#{teamOutputDTO.thicknessSum},'\\.0+$','')
</if>
<if test="teamOutputDTO.thicknessArea != null and teamOutputDTO.thicknessArea != ''">
AND x.thicknessArea REGEXP #{teamOutputDTO.thicknessArea}
@@ -2875,7 +2875,7 @@
) x
WHERE 1 = 1
<if test="teamOutputDTO.thicknessSum != null and teamOutputDTO.thicknessSum != ''">
- AND x.thicknessSum REGEXP #{teamOutputDTO.thicknessSum}
+ and thicknessSum regexp REGEXP_REPLACE(#{teamOutputDTO.thicknessSum},'\\.0+$','')
</if>
<if test="teamOutputDTO.thicknessArea != null and teamOutputDTO.thicknessArea != ''">
AND x.thicknessArea REGEXP #{teamOutputDTO.thicknessArea}
--
Gitblit v1.8.0