From bcd7d1c9222431f37a6579a72456b2edb8f02402 Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期五, 07 三月 2025 10:54:38 +0800 Subject: [PATCH] art: 验收日期 与 下次三保日期计算关系 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 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 2b4251a..14d4ca6 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 @@ -108,7 +108,7 @@ t1.fault_time as faultTime, t2.item_text as maintenanceMethodName, t3.name as teamName, - t4.realname as recipientuserName, + t1.recipient_user_id as recipientuserName, t1.actual_hour as actualHour, t1.actual_start_time AS actualStartTime, t1.actual_end_time as actualEndTime @@ -116,8 +116,7 @@ mom_eam_repair_order t1 LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'maintenance_method' ) t2 ON t2.item_value = t1.maintenance_method left join mom_base_team t3 on t1.team_id = t3.id - left join sys_user t4 on t1.recipient_user_id = t4.id - WHERE t1.del_flag = '0' and t4.del_flag= '0' and t3.del_flag= '0' and t1.equipment_id = #{params.equipmentId} + WHERE t1.del_flag = '0' and t1.equipment_id = #{params.equipmentId} </select> <select id="getResumeCalibrationRecordList" parameterType="Map" resultType="Map"> @@ -165,13 +164,14 @@ mom_eam_equipment t1 LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'equipment_status' ) t2 ON t1.equipment_status = t2.item_value WHERE t1.del_flag = '0' - <if test="params.num != 'null' and params.num != ''"> - and t1.num like concat('%',#{params.num},'%') - </if> - <if test="params.name != 'null' and params.name != ''"> - and t1.name like concat('%',#{params.name},'%') - </if> + </select> + <!-- <if test="params.num != 'null' and params.num != ''">--> + <!-- and t1.num like concat('%',#{params.num},'%')--> + <!-- </if>--> + <!-- <if test="params.name != 'null' and params.name != ''">--> + <!-- and t1.name like concat('%',#{params.name},'%')--> + <!-- </if>--> <select id="getEquipmentList" resultType="org.jeecg.modules.eam.entity.Equipment"> select t1.id id, @@ -405,6 +405,9 @@ t1.next_technology_status_qualification_time nextTechnologyStatusQualificationTime, t1.technology_status_qualification_time technologyStatusQualificationTime, t1.technology_status_verification_type technologyStatusVerificationType, + t1.second_maintenance_time secondMaintenanceTime, + t1.third_maintenance_time thirdMaintenanceTime, + t1.next_third_maintenance_time nextThirdMaintenanceTime, t1.line_id lineId, t1.is_meta isMeta, t1.id showId, -- Gitblit v1.9.3