update

Lius

2024-10-18 2f4d58a807ae1d91e43f7d7df33ce6b414c794ad

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

@@ -13,10 +13,10 @@
            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 t1.EquipmentID  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}
@@ -49,7 +49,7 @@
                AND t1.EquipmentID  LIKE CONCAT(CONCAT('%',#{equipmentAlarmVo.equipmentId}),'%')
            </if>
            <if test="equipmentAlarmVo.equipmentName != null and equipmentAlarmVo.equipmentName != ''">
                AND t1.EquipmentID  LIKE CONCAT(CONCAT('%',#{equipmentAlarmVo.equipmentName}),'%')
                AND t2.equipment_name  LIKE CONCAT(CONCAT('%',#{equipmentAlarmVo.equipmentName}),'%')
            </if>
            <if test="equipmentAlarmVo.startTime != null and equipmentAlarmVo.endTime != null">
                AND t1.collectTime BETWEEN #{equipmentAlarmVo.startTime} AND #{equipmentAlarmVo.endTime}