设备履历取消专业点检记录

qushaowei

2023-08-29 57e1cd3bbf4b9de87019b5ed5ca428810516976a

设备履历取消专业点检记录

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml

@@ -91,23 +91,23 @@
        left join mom_eam_inspection_cycle t5 on t1.inspection_cycle_id = t5.id
        WHERE t1.del_flag = '0' and t2.del_flag= '0'  and t5.del_flag= '0' and t2.equipment_id = #{params.equipmentId}

        UNION All

        SELECT DISTINCT
            t1.id,
            '专业点检' as inspectionType,
            t1.num,
            t1.inspection_time as inspectionTime,
            t3.name as teamName,
            t4.realname as inspectionUserName,
            t1.plan_end_time as actualEndTime
        FROM
            mom_eam_specialty_inspection_order t1
        LEFT JOIN mom_eam_specialty_inspection_order_detail t2 on t1.id = t2.specialty_inspection_order_id
        left join sys_user t4 on t1.inspection_user_id = t4.id
        left join mom_eam_specialty_inspection_plan t5 on t1.specialty_inspection_plan_id = t5.id
        left join mom_base_team t3 on t5.team_id = t3.id
        WHERE t1.del_flag = '0' and t2.del_flag= '0'  and t5.del_flag= '0' and t2.equipment_id = #{params.equipmentId}
--         UNION All
--
--         SELECT DISTINCT
--             t1.id,
--             '专业点检' as inspectionType,
--             t1.num,
--             t1.inspection_time as inspectionTime,
--             t3.name as teamName,
--             t4.realname as inspectionUserName,
--             t1.plan_end_time as actualEndTime
--         FROM
--             mom_eam_specialty_inspection_order t1
--         LEFT JOIN mom_eam_specialty_inspection_order_detail t2 on t1.id = t2.specialty_inspection_order_id
--         left join sys_user t4 on t1.inspection_user_id = t4.id
--         left join mom_eam_specialty_inspection_plan t5 on t1.specialty_inspection_plan_id = t5.id
--         left join mom_base_team t3 on t5.team_id = t3.id
--         WHERE t1.del_flag = '0' and t2.del_flag= '0'  and t5.del_flag= '0' and t2.equipment_id = #{params.equipmentId}
    </select>

    <select id="getResumeMaintenanceRecordList"  parameterType="Map" resultType="Map">