From 56e8ccde7c982bc2a5b9746edb2e596c895f63e6 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期三, 13 十二月 2023 15:20:07 +0800
Subject: [PATCH] 利用率页面添加平均值和合计值
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentReportRepairMapper.xml | 49 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 46 insertions(+), 3 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentReportRepairMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentReportRepairMapper.xml
index 33585c7..0a1d0b9 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentReportRepairMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentReportRepairMapper.xml
@@ -4,6 +4,8 @@
<select id="getReportRepairList" parameterType="Map" resultType="Map">
SELECT
t1.id,
+ t1.err_uda1 errUda1,
+ t1.err_uda2 errUda2,
t1.num num,
t1.equipment_id equipmentId,
t1.fault_reason faultReason,
@@ -31,7 +33,8 @@
t3.depart_name departName,
t4.item_text urgencyName,
t5.item_text statusName,
- t6.item_text isStopName
+ t6.item_text isStopName,
+ t7.item_text errUda1_dictText
FROM
mom_eam_equipment_report_repair t1
left join mom_eam_equipment t2 on t1.equipment_id = t2.id
@@ -39,6 +42,7 @@
left join (select * from v_sys_dict where dict_code='urgency') t4 on t1.urgency = t4.item_value
left join (select * from v_sys_dict where dict_code='equipment_report_repair_status') t5 on t1.status = t5.item_value
left join (select * from v_sys_dict where dict_code='is_stop') t6 on t1.is_stop = t6.item_value
+ left join (select * from v_sys_dict where dict_code='is_product') t7 on t1.err_uda1 = t7.item_value
WHERE t1.del_flag = 0
<if test="params.num != null and params.num != ''">
and t1.num like concat('%',#{params.num},'%')
@@ -46,18 +50,57 @@
<if test="params.equipmentId != null and params.equipmentId != ''">
and t1.equipment_id = #{params.equipmentId}
</if>
+ <if test="params.faultDescription != null and params.faultDescription != ''">
+ and t1.fault_description like concat('%',#{params.faultDescription},'%')
+ </if>
+ <if test="params.faultStartTime != null and params.faultStartTime != ''">
+ and t1.fault_time >= #{params.faultStartTime}
+ </if>
+ <if test="params.faultEndTime != null and params.faultEndTime != ''">
+ and t1.fault_time <= #{params.faultEndTime}
+ </if>
+ <if test="params.isStop != null and params.isStop != ''">
+ and t1.is_stop = #{params.isStop}
+ </if>
+ <if test="params.status != null and params.status != ''">
+ and t1.status = #{params.status}
+ </if>
+ <if test="params.errUda2 != null and params.errUda2 != ''">
+ and t1.err_uda2 like concat('%',#{params.errUda2},'%')
+ </if>
+ <if test="params.errUda1 != null and params.errUda1 != ''">
+ and t1.err_uda1 = #{params.errUda1}
+ </if>
+ <if test="params.isStop != null and params.isStop != ''">
+ and t1.is_stop = #{params.isStop}
+ </if>
+ <if test="params.createBy!= null and params.createBy != ''">
+ and t1.create_by like concat('%',#{params.createBy},'%')
+ </if>
<if test="params.equipmentNum != null and params.equipmentNum != ''">
and t2.num like concat('%',#{params.equipmentNum},'%')
</if>
<if test="params.equipmentName != null and params.equipmentName != ''">
and t2.name like concat('%',#{params.equipmentName},'%')
</if>
- <if test="params.status != null and params.status != ''">
- and t1.status = #{params.status}
+ <if test="params.model != null and params.model != ''">
+ and t2.model like concat('%',#{params.model},'%')
+ </if>
+ <if test="params.specification != null and params.specification != ''">
+ and t2.specification like concat('%',#{params.specification},'%')
+ </if>
+ <if test="params.useId != null and params.useId != ''">
+ and t2.use_id = #{params.useId}
</if>
<if test="params.teamId != null and params.teamId != ''">
and t2.team_id = #{params.teamId}
</if>
+ <if test="equipNums.size!=0">
+ and t2.num in
+ <foreach collection="equipNums" open="(" separator="," close=")" item="num">
+ #{num}
+ </foreach>
+ </if>
ORDER BY t1.create_time desc
</select>
</mapper>
--
Gitblit v1.9.3