From 4b27dd367eae2f24958c6bb857fb6959dcdb7a4a Mon Sep 17 00:00:00 2001 From: qushaowei <qushaowei@163.com> Date: 星期五, 13 六月 2025 18:04:46 +0800 Subject: [PATCH] 报表提交 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentReportRepairMapper.xml | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 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 7620836..479147f 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 @@ -14,6 +14,7 @@ t1.is_stop isStop, t1.approval approval, t1.fault_time faultTime, + t1.type, t1.source source, t1.source_id sourceId, t1.urgency urgency, @@ -37,11 +38,17 @@ t4.item_text urgencyName, t5.item_text statusName, t6.item_text isStopName, - t7.item_text errUda1_dictText + t7.item_text errUda1_dictText, + t8.id quanlityId, + t9.id faultInfoId, + t8.is_confirm isConfirm1, + t9.is_confirm isConfirm2 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 mom_eam_quanlity_confirm t8 on t1.id = t8.report_id + left join mom_eam_fault_info t9 on t8.id = t9.quanlity_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 @@ -107,6 +114,12 @@ #{num} </foreach> </if> + <if test="params.workCenterIds != null"> + and t2.work_center_id in + <foreach collection="params.workCenterIds" open="(" separator="," close=")" item="workCenterId"> + #{workCenterId} + </foreach> + </if> ORDER BY t1.create_time desc </select> <select id="exportList" resultType="org.jeecg.modules.eam.vo.RepairReportExportVo"> @@ -138,6 +151,7 @@ t2.num equipmentNum, t2.name equipmentName, t2.model equipmentModel, + t2.model, t2.team_id teamId, t2.specification specification, t2.use_id useId, -- Gitblit v1.9.3