From 5c3742eca3b35c96f66c53b8dfabcb6848e03a7d Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期三, 13 十二月 2023 16:46:19 +0800
Subject: [PATCH] 修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 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..7026233 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
@@ -234,7 +234,7 @@
t1.port port,
t1.coordinate_num coordinateNum,
t1.project_approval_no projectApprovalNo,
- t1.standard_a tandardA,
+ t1.standard_a standardA,
t1.standard_b standardB,
t1.standard_c standardC,
t1.standard_d standardD,
@@ -248,9 +248,16 @@
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,
+ t1.is_line_equip isLineEquip,
+ t1.is_judging isJudging,
+ 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},'%')
@@ -282,6 +289,12 @@
<if test="equipmentStatus != null and equipmentStatus != ''">
and t1.equipment_status = #{equipmentStatus}
</if>
+ <if test="isLineEquip != null and isLineEquip != ''">
+ and t1.is_line_equip = #{isLineEquip}
+ </if>
+ <if test="isLine != null and isLine != ''">
+ and t1.is_line = #{isLine}
+ </if>
<if test="specificEquipment != null and specificEquipment != ''">
and t1.specific_equipment = #{specificEquipment}
</if>
@@ -294,7 +307,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
@@ -329,6 +345,7 @@
on t8.id = t3.maintenance_cycle_id
where t4.version_status = '2') t9 where
t9.equipmentId = #{mainId}
+ and t9.type = #{type}
order by t9.type
</select>
--
Gitblit v1.9.3