From 9b015b51b72ba050b4c38a6ba79eb45b7065e67d Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 25 七月 2024 10:11:52 +0800
Subject: [PATCH] 调整sql
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/InspectionCycleMapper.xml | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/InspectionCycleMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/InspectionCycleMapper.xml
index 4e84bbf..582757a 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/InspectionCycleMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/InspectionCycleMapper.xml
@@ -20,8 +20,10 @@
t1.arrange_way arrangeWay,
t1.audit_status auditStatus,
t1.first_inspection_time as firstInspectionTime,
- DATE_FORMAT(t1.first_inspection_time, '%Y-%m-%d') firstInspectionTime1,
- DATE_FORMAT(t1.first_inspection_time, '%h:%i:%s') firstInspectionTime2,
+ t1.take_effect_time as takeEffectTime,
+ t1.lose_efficacy_time as loseEfficacyTime,
+ CONVERT( VARCHAR(100), t1.first_inspection_time, 23 ) firstInspectionTime1,
+ CONVERT( VARCHAR(100), t1.first_inspection_time, 8 ) firstInspectionTime2,
t1.lead_time leadTime,
t1.effective_time effectiveTime,
t2.item_text cycleUnitName,
@@ -80,4 +82,18 @@
where t2.version_status='2'
and t1.del_flag=0
</select>
+
+ <select id="getInspectionOrder" resultType="org.jeecg.modules.eam.entity.InspectionCycle">
+ select DISTINCT t1.num inspectionStandardNum,
+ t1.equipment_id,
+ t2.daily_inspection_standard_id inspectionStandardId,
+ t3.*,
+ t4.team_id teamId
+ from mom_eam_daily_inspection_standard t1
+ left join mom_eam_daily_inspection_standard_detail t2 on t1.id = t2.daily_inspection_standard_id
+ left join mom_eam_inspection_cycle t3 on t3.id = t2.inspection_cycle_id
+ left join mom_eam_equipment t4 on t4.id = t1.equipment_id
+ where t1.version_status = 2 and t1.status = 1 and t1.del_flag=0 and t3.name is not NULL
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3