DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(mapper): 修复XML映射文件中的特殊字符转义问题

Browse Source 
- 将所有 < 符号替换为 &lt; 以确保XML有效性
- 更新了时间比较条件中的特殊字符转义
- 修复了日期范围查询中的字符转义问题
- 确保所有SQL查询条件正确转义特殊字符
- 维护了原有的业务逻辑不变
This commit is contained in:
Joshi
2026-01-20 17:10:11 +08:00
parent fefe4a8554
commit 5432f0c3eb
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
klp-ems/src/main/resources/mapper/WmsEnergyCoilDailyMapper.xml
View File

@@ -247,7 +247,7 @@
c.enter_coil_no,
SUM(
CASE
WHEN pa.create_time < COALESCE(pa.complete_time, NOW())
WHEN pa.create_time &lt; COALESCE(pa.complete_time, NOW())
THEN TIMESTAMPDIFF(MINUTE, pa.create_time, COALESCE(pa.complete_time, NOW()))
ELSE 0
END
@@ -260,7 +260,7 @@
DATE(pa_all.create_time) AS day_key,
SUM(
CASE
WHEN pa_all.create_time < COALESCE(pa_all.complete_time, NOW())
WHEN pa_all.create_time &lt; COALESCE(pa_all.complete_time, NOW())
THEN TIMESTAMPDIFF(MINUTE, pa_all.create_time, COALESCE(pa_all.complete_time, NOW()))
ELSE 0
END
@@ -268,12 +268,12 @@
FROM wms_coil_pending_action pa_all
WHERE pa_all.action_status IN (0,1,2)
AND pa_all.create_time >= CONCAT(#{bo.startDate}, ' 00:00:00')
AND pa_all.create_time <= CONCAT(#{bo.endDate}, ' 23:59:59')
AND pa_all.create_time &lt;= CONCAT(#{bo.endDate}, ' 23:59:59')
GROUP BY DATE(pa_all.create_time)
) td ON td.day_key = DATE(pa.create_time)
WHERE pa.action_status IN (0,1,2)
AND pa.create_time >= CONCAT(#{bo.startDate}, ' 00:00:00')
AND pa.create_time <= CONCAT(#{bo.endDate}, ' 23:59:59')
AND pa.create_time &lt;= CONCAT(#{bo.endDate}, ' 23:59:59')
GROUP BY DATE(pa.create_time), c.enter_coil_no, td.total_minutes
) dm
LEFT JOIN (
@@ -284,7 +284,7 @@
WHERE del_flag = '0'
AND change_type = '减少'
AND change_time >= CONCAT(#{bo.startDate}, ' 00:00:00')
AND change_time <= CONCAT(#{bo.endDate}, ' 23:59:59')
AND change_time &lt;= CONCAT(#{bo.endDate}, ' 23:59:59')
GROUP BY DATE(change_time)
) a ON dm.day_key = a.day_key
LEFT JOIN (
@@ -295,7 +295,7 @@
WHERE del_flag = '0'
AND change_type = '减少'
AND change_time >= CONCAT(#{bo.startDate}, ' 00:00:00')
AND change_time <= CONCAT(#{bo.endDate}, ' 23:59:59')
AND change_time &lt;= CONCAT(#{bo.endDate}, ' 23:59:59')
GROUP BY DATE(change_time)
) p ON dm.day_key = p.day_key
GROUP BY dm.enter_coil_no
@@ -515,7 +515,7 @@
c.enter_coil_no,
SUM(
CASE
WHEN pa.create_time < COALESCE(pa.complete_time, NOW())
WHEN pa.create_time &lt; COALESCE(pa.complete_time, NOW())
THEN TIMESTAMPDIFF(MINUTE, pa.create_time, COALESCE(pa.complete_time, NOW()))
ELSE 0
END
@@ -528,7 +528,7 @@
DATE(pa_all.create_time) AS day_key,
SUM(
CASE
WHEN pa_all.create_time < COALESCE(pa_all.complete_time, NOW())
WHEN pa_all.create_time &lt; COALESCE(pa_all.complete_time, NOW())
THEN TIMESTAMPDIFF(MINUTE, pa_all.create_time, COALESCE(pa_all.complete_time, NOW()))
ELSE 0
END
@@ -536,12 +536,12 @@
FROM wms_coil_pending_action pa_all
WHERE pa_all.action_status IN (0,1,2)
AND pa_all.create_time >= CONCAT(#{bo.startDate}, ' 00:00:00')
AND pa_all.create_time <= CONCAT(#{bo.endDate}, ' 23:59:59')
AND pa_all.create_time &lt;= CONCAT(#{bo.endDate}, ' 23:59:59')
GROUP BY DATE(pa_all.create_time)
) td ON td.day_key = DATE(pa.create_time)
WHERE pa.action_status IN (0,1,2)
AND pa.create_time >= CONCAT(#{bo.startDate}, ' 00:00:00')
AND pa.create_time <= CONCAT(#{bo.endDate}, ' 23:59:59')
AND pa.create_time &lt;= CONCAT(#{bo.endDate}, ' 23:59:59')
GROUP BY DATE(pa.create_time), c.enter_coil_no, td.total_minutes
) dm
LEFT JOIN (
@@ -552,7 +552,7 @@
WHERE del_flag = '0'
AND change_type = '减少'
AND change_time >= CONCAT(#{bo.startDate}, ' 00:00:00')
AND change_time <= CONCAT(#{bo.endDate}, ' 23:59:59')
AND change_time &lt;= CONCAT(#{bo.endDate}, ' 23:59:59')
GROUP BY DATE(change_time)
) a ON dm.day_key = a.day_key
LEFT JOIN (
@@ -563,7 +563,7 @@
WHERE del_flag = '0'
AND change_type = '减少'
AND change_time >= CONCAT(#{bo.startDate}, ' 00:00:00')
AND change_time <= CONCAT(#{bo.endDate}, ' 23:59:59')
AND change_time &lt;= CONCAT(#{bo.endDate}, ' 23:59:59')
GROUP BY DATE(change_time)
) p ON dm.day_key = p.day_key
GROUP BY dm.enter_coil_no