update

Lius

2024-10-21 316ef1bf39d16a29c27fe26393e704c1d0b963f9

 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.equipment_id  LIKE CONCAT(CONCAT('%',#{equipmentAlarmVo.equipmentId}),'%')
                AND t1.EquipmentID  LIKE '%' + #{equipmentAlarmVo.equipmentId} + '%'
            </if>
            <if test="equipmentAlarmVo.equipmentName != null and equipmentAlarmVo.equipmentName != ''">
                AND t1.equipment_id  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}
@@ -46,10 +46,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.equipment_id  LIKE CONCAT(CONCAT('%',#{equipmentAlarmVo.equipmentId}),'%')
                AND t1.EquipmentID  LIKE '%' + #{equipmentAlarmVo.equipmentId} + '%'
            </if>
            <if test="equipmentAlarmVo.equipmentName != null and equipmentAlarmVo.equipmentName != ''">
                AND t1.equipment_id  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}
@@ -67,4 +67,16 @@
            , t1.EquipmentID DESC
        </if>
    </select>

    <select id="equipmentAlarm" resultType="org.jeecg.modules.mdc.entity.EquipmentAlarm">
        SELECT
            t1.*
        FROM
            EquipmentAlarm t1
                LEFT JOIN mdc_equipment t2 ON t1.EquipmentID = t2.equipment_id
                LEFT JOIN mdc_production_equipment t3 ON t2.id = t3.equipment_id
        WHERE
            t3.production_id = #{productionId}
          AND t1.collectTime BETWEEN #{startDate} AND #{endDate}
    </select>
</mapper>