lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentFaultInfoMapper.xml
@@ -12,7 +12,11 @@ LEFT JOIN eam_repair_order t2 ON t2.report_id = t1.id LEFT JOIN eam_equipment t3 ON t1.equipment_id = t3.id WHERE ( ( t1.fault_start_time BETWEEN #{startTime} AND #{endTime} ) OR ( t2.actual_end_time BETWEEN #{startTime} AND #{endTime} ) ) ( ( t1.fault_start_time BETWEEN #{startTime} AND #{endTime} ) OR ( t2.actual_end_time BETWEEN #{startTime} AND #{endTime} ) OR ( t1.fault_start_time < #{startTime} AND t2.actual_end_time IS NULL ) ) AND t3.equipment_code IN <foreach collection="equipmentIdList" item="id" index="index" open="(" close=")" separator=","> #{ id } lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentRunningSectionMapper.xml
@@ -198,7 +198,11 @@ LEFT JOIN eam_repair_order t2 ON t2.report_id = t1.id LEFT JOIN eam_equipment t3 ON t1.equipment_id = t3.id WHERE ( ( t1.fault_start_time BETWEEN #{startTime} AND #{endTime} ) OR ( t2.actual_end_time BETWEEN #{startTime} AND #{endTime} ) ) ( ( t1.fault_start_time BETWEEN #{startTime} AND #{endTime} ) OR ( t2.actual_end_time BETWEEN #{startTime} AND #{endTime} ) OR ( t1.fault_start_time < #{startTime} AND t2.actual_end_time IS NULL ) ) AND t3.equipment_code = #{equipmentId} AND t1.report_status != 'ABOLISH' </select>