From e16cabb6f35597b97c770a9fa56de5bce4a4494e Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期一, 26 五月 2025 14:20:03 +0800
Subject: [PATCH] 数据格式修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/InspectionOrderMapper.xml | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/InspectionOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/InspectionOrderMapper.xml
index 0bc3dba..66b0ba0 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/InspectionOrderMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/InspectionOrderMapper.xml
@@ -291,11 +291,10 @@
LEFT JOIN mom_eam_daily_inspection_standard t2 ON t1.daily_inspection_standard_id = t2.id
LEFT JOIN mom_eam_inspection_project t3 ON t1.inspection_project_id = t3.id
LEFT JOIN mom_eam_equipment t4 ON t2.equipment_id = t4.id
- WHERE t4.num = '0524'
+ left join mom_eam_inspection_cycle t5 on t1.inspection_cycle_id = t5.id
+ WHERE t4.num = '0526'
AND t2.version_status = '2'
- UNION ALL select '' as name,'缁存姢璐ｄ换浜虹瀛�' as detectionStandard
- UNION ALL select '' as name,'妫�鏌ヨ矗浠讳汉绛惧瓧' as detectionStandard
-
+ and t5.cycle_unit = #{cycleUnit}
</select>
<select id="findDayInspectionStandardProject" parameterType="String" resultType="Map">
@@ -312,7 +311,17 @@
left join mom_eam_inspection_project t3 on t1.inspection_project_id = t3.id
LEFT JOIN mom_eam_equipment t4 ON t2.equipment_id = t4.id
WHERE
- t4.num = '0524'
+
+ <if test="equipmentNum != null and equipmentNum != ''">
+ t4.num = #{equipmentNum}
+ </if>
+ <if test="equipmentNum == null and equipmentNum == ''"> and t4.num = '-1' </if>
+ <if test="dataTime != null and dataTime != ''">
+ AND SUBSTRING ( CONVERT ( VARCHAR ( 10 ), t1.create_time, 120 ), 1, 7 ) = SUBSTRING ( CONVERT ( VARCHAR ( 10 ), #{dataTime}, 120 ), 2, 7 )
+ </if>
+ <if test="dataTime == null and dataTime == ''">
+ AND SUBSTRING ( CONVERT ( VARCHAR ( 10 ), t1.create_time, 120 ), 1, 7 ) = SUBSTRING ( CONVERT ( VARCHAR ( 10 ), GETDATE( ), 120 ), 1, 7 )
+ </if>
and t3.name = #{name} and t3.detection_standard = #{detectionStandard}
</select>
@@ -324,7 +333,8 @@
FROM
mom_eam_inspection_order t1
LEFT JOIN mom_eam_equipment t2 ON t1.equipment_id = t2.id
+ LEFT JOIN mom_eam_inspection_cycle t3 ON t1.inspection_cycle_id = t3.id
WHERE
- t2.num = '0524'
+ t2.num = '0526' and t3.cycle_unit = #{cycleUnit}
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3