From 654dc30c50b1c176966ad8e6e7d791b92531de83 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 25 七月 2024 09:53:25 +0800
Subject: [PATCH] 问题项修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderMapper.xml | 42 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderMapper.xml
index f741f23..3d66031 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderMapper.xml
@@ -122,6 +122,13 @@
<if test="createEndTime != null">
and t1.create_time <= #{createEndTime}
</if>
+
+ <if test="workCenterIds != null">
+ and t2.work_center_id in
+ <foreach collection="workCenterIds" open="(" separator="," close=")" item="workCenterId">
+ #{workCenterId}
+ </foreach>
+ </if>
order by t1.create_time desc
</select>
@@ -232,8 +239,11 @@
t1.del_flag = 0
AND t2.del_flag = 0
<if test="params.equipmentNum != null and params.equipmentNum != ''">
- and t11.num = #{params.equipmentNum}
+ and t11.num like concat('%',#{params.equipmentNum},'%')
</if>
+ <if test="params.useId != null and params.useId != ''">
+ and t11.use_id = #{params.useId}
+ </if>
<if test="params.faultStartTime != null">
and t2.create_time >= #{params.faultStartTime}
</if>
@@ -261,7 +271,10 @@
t1.del_flag = 0
AND t2.del_flag = 0
<if test="params.equipmentNum != null and params.equipmentNum != ''">
- and t11.num = #{params.equipmentNum}
+ and t11.num like concat('%',#{params.equipmentNum},'%')
+ </if>
+ <if test="params.useId != null and params.useId != ''">
+ and t11.use_id = #{params.useId}
</if>
<if test="params.faultStartTime != null">
and t2.create_time >= #{params.faultStartTime}
@@ -271,6 +284,26 @@
</if>
) t4 ON t3.item_value = t4.repair_order_fault_analysis_uda2
group by t3.item_text
+ </select>
+
+ <select id="getEquipmentFaultCause" parameterType="Map" resultType="Map">
+ select count(SUBSTRING(CONVERT(VARCHAR(10), t1.fault_time, 120), 1, 10)) as '璁惧鏁呴殰娆℃暟',
+ SUBSTRING(CONVERT(VARCHAR(10), t1.fault_time, 120), 1, 10) as type from mom_eam_equipment_report_repair t1
+ left join mom_eam_equipment t2 on t1.equipment_id = t2.id
+ where 1=1
+ <if test="params.equipmentNum != null and params.equipmentNum != ''">
+ and t2.num like concat('%',#{params.equipmentNum},'%')
+ </if>
+ <if test="params.useId != null and params.useId != ''">
+ and t2.use_id = #{params.useId}
+ </if>
+ <if test="params.faultStartTime != null">
+ and t1.fault_time >= #{params.faultStartTime}
+ </if>
+ <if test="params.faultEndTime != null">
+ and t1.fault_time <= #{params.faultEndTime}
+ </if>
+ GROUP BY SUBSTRING(CONVERT(VARCHAR(10), t1.fault_time, 120), 1, 10)
</select>
<select id="getMTPF" parameterType="Map" resultType="Map">
@@ -290,7 +323,10 @@
t1.del_flag = 0
AND t2.del_flag = 0
<if test="params.equipmentNum != null and params.equipmentNum != ''">
- and t11.num = #{params.equipmentNum}
+ and t11.num like concat('%',#{params.equipmentNum},'%')
+ </if>
+ <if test="params.useId != null and params.useId != ''">
+ and t11.use_id = #{params.useId}
</if>
<if test="params.faultStartTime != null">
and t2.create_time >= #{params.faultStartTime}
--
Gitblit v1.9.3