From 094a9290c836827bc1f45fd3549e7cd2ea1e1e45 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期二, 07 十一月 2023 09:45:36 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentReportRepairMapper.xml | 64 +++++++++++++++++++------------
1 files changed, 39 insertions(+), 25 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 26440d9..33585c7 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
@@ -3,37 +3,42 @@
<mapper namespace="org.jeecg.modules.eam.mapper.EquipmentReportRepairMapper">
<select id="getReportRepairList" parameterType="Map" resultType="Map">
SELECT
- t1.id,
- t1.num num,
- t1.equipment_id equipmentId,
- t1.fault_description faultDescription,
- t1.photo photo,
- t1.approval approval,
- t1.fault_time faultTime,
- t1.source source,
- t1.source_id sourceId,
- t1.urgency urgency,
- t1.is_create_order isCreateOrder,
- t1.use_depart_id useDepartId,
- t1.remark remark,
- t1.status status,
- t1.create_by createBy,
- t1.create_time createTime,
- t1.update_by updateBy,
- t1.update_time updateTime,
- t2.num equipmentNum,
- t2.name equipmentName,
- t2.model equipmentModel,
- t2.specification equipmentSpecification,
- t3.depart_name departName,
- t4.item_text urgencyName,
- t5.item_text statusName
+ t1.id,
+ t1.num num,
+ t1.equipment_id equipmentId,
+ t1.fault_reason faultReason,
+ t1.fault_description faultDescription,
+ t1.photo photo,
+ t1.is_stop isStop,
+ t1.approval approval,
+ t1.fault_time faultTime,
+ t1.source source,
+ t1.source_id sourceId,
+ t1.urgency urgency,
+ t1.is_create_order isCreateOrder,
+ t1.use_depart_id useDepartId,
+ t1.remark remark,
+ t1.status status,
+ t1.create_by createBy,
+ t1.create_time createTime,
+ t1.update_by updateBy,
+ t1.update_time updateTime,
+ t2.num equipmentNum,
+ t2.name equipmentName,
+ t2.model equipmentModel,
+ t2.team_id teamId,
+ t2.specification equipmentSpecification,
+ t3.depart_name departName,
+ t4.item_text urgencyName,
+ t5.item_text statusName,
+ t6.item_text isStopName
FROM
mom_eam_equipment_report_repair t1
left join mom_eam_equipment t2 on t1.equipment_id = t2.id
left join sys_depart t3 on t1.use_depart_id = t3.id
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
WHERE t1.del_flag = 0
<if test="params.num != null and params.num != ''">
and t1.num like concat('%',#{params.num},'%')
@@ -44,6 +49,15 @@
<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>
+ <if test="params.teamId != null and params.teamId != ''">
+ and t2.team_id = #{params.teamId}
+ </if>
ORDER BY t1.create_time desc
</select>
</mapper>
--
Gitblit v1.9.3