license

Lius

2024-11-07 81eae83295642387de38a97fdc5a35f485307587

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentAlarmMapper.xml

@@ -8,7 +8,8 @@
            t2.equipment_name,
            t1.collectTime,
            t1.AlarmNo,
            t1.AlarmContent
            t1.AlarmContent,
            t2.drive_type
        FROM
            EquipmentAlarm t1 LEFT JOIN mdc_equipment t2 ON t1.EquipmentID = t2.equipment_id
        <where>
@@ -41,15 +42,16 @@
        t2.equipment_name,
        t1.collectTime,
        t1.AlarmNo,
        t1.AlarmContent
        t1.AlarmContent,
        t2.drive_type
        FROM
        EquipmentAlarm t1 LEFT JOIN mdc_equipment t2 ON t1.EquipmentID = t2.equipment_id
        <where>
            <if test="equipmentAlarmVo.equipmentId != null and equipmentAlarmVo.equipmentId != ''">
                AND t1.EquipmentID  LIKE CONCAT(CONCAT('%',#{equipmentAlarmVo.equipmentId}),'%')
                AND t1.EquipmentID  LIKE '%' + #{equipmentAlarmVo.equipmentId} + '%'
            </if>
            <if test="equipmentAlarmVo.equipmentName != null and equipmentAlarmVo.equipmentName != ''">
                AND t2.equipment_name  LIKE CONCAT(CONCAT('%',#{equipmentAlarmVo.equipmentName}),'%')
                AND t2.equipment_name  LIKE '%' + #{equipmentAlarmVo.equipmentName} + '%'
            </if>
            <if test="equipmentAlarmVo.startTime != null and equipmentAlarmVo.endTime != null">
                AND t1.collectTime BETWEEN #{equipmentAlarmVo.startTime} AND #{equipmentAlarmVo.endTime}