From 38c6f00b5efbbb9ce21669a887e03d6cb8ce3df9 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期一, 20 十一月 2023 19:03:45 +0800
Subject: [PATCH] 生产线
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 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 42a6cb7..7809e61 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
@@ -248,9 +248,14 @@
t1.check_period checkPeriod,
t1.next_technology_status_qualification_time nextTechnologyStatusQualificationTime,
t1.technology_status_qualification_time technologyStatusQualificationTime,
- t1.technology_status_verification_type technologyStatusVerificationType
+ t1.technology_status_verification_type technologyStatusVerificationType,
+ t1.line_id lineId,
+ t1.is_meta isMeta,
+ t1.id showId,
+ 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
+ left join (select * from mom_eam_equipment_category where del_flag = 0) t2 on t1.equipment_category_id = t2.id
+ left join(select count(id) sumOfEquipment,line_id from mom_eam_equipment where del_flag=0 group by line_id) t3 on t3.line_id = t1.id
where t1.del_flag = 0
<if test="num != null and num != ''">
and t1.num like concat('%',#{num},'%')
@@ -294,7 +299,10 @@
<if test="sql != null and sql != ''">
and t2.equipment_category_uda1 = #{sql}
</if>
- order by t1.create_time desc
+ <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
</select>
<select id="getStandardList" resultType="org.jeecg.modules.eam.entity.DailyInspectionStandardDetail">
select t9.* from ( select
--
Gitblit v1.9.3