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/EamEquipmentMapper.xml | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml
index 796eb9e..66462e6 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml
@@ -252,8 +252,10 @@
t1.line_id lineId,
t1.is_meta isMeta,
t1.id showId,
+ t1.is_line isLine,
t1.is_line_equip isLineEquip,
t1.is_judging isJudging,
+ t1.area_id areaId,
t3.sumOfEquipment
from mom_eam_equipment t1
left join (select * from mom_eam_equipment_category where del_flag = 0) t2 on t1.equipment_category_id = t2.id
@@ -273,6 +275,10 @@
</if>
<if test="workCenterId != null and workCenterId != ''">
and t1.work_center_id = #{workCenterId}
+ </if>
+-- 鏍规嵁areaId鏌ヨ璁惧
+ <if test="areaId != null and areaId != ''">
+ and t1.area_id = #{areaId}
</if>
<if test="factoryModelId != null and factoryModelId != ''">
and t1.factory_model_id = #{factoryModelId}
@@ -319,12 +325,14 @@
<if test="lineId != null and lineId != ''">
and t1.line_id = #{lineId}
</if>
- order by (CASE WHEN t1.is_meta='yes' then GETDATE() else t1.create_time end) desc
+ order by t1.create_time desc
</select>
+<!-- order by (CASE WHEN t1.is_meta='yes' then GETDATE() else t1.create_time end) desc-->
<select id="getStandardList" resultType="org.jeecg.modules.eam.entity.DailyInspectionStandardDetail">
select t9.* from ( select
t1.id id,
t5.name projectName,
+ '' as maintenanceRole,
t5.detection_standard standard,
'1' as type,
t6.name cycleName,
@@ -341,6 +349,7 @@
select
t3.id id,
t7.name projectName,
+ t3.maintenance_role maintenanceRole,
t7.standard standard,
t8.maintenance_type type,
t8.name cycleName,
--
Gitblit v1.9.3