Commit 0ff9649b authored by KeYong's avatar KeYong

修改bug

parent 88f31704
......@@ -260,7 +260,8 @@
resolve_result = #{resolveResult},
confirm_user_name = #{confirmUserName},
confirm_type_name = #{confirmTypeName},
alarm_reason = concat((select name from wl_equipment_specific WHERE id = wl_equipment_specific_alarm_log.equipment_specific_id) ,'故障引起设备报警')
alarm_reason = concat((select name from wl_equipment_specific WHERE id = wl_equipment_specific_alarm_log.equipment_specific_id) ,'故障引起设备报警'),
equipment_specific_index_value = false
WHERE
confirm_type is null or clean_time is null
</update>
......
......@@ -14,7 +14,7 @@
</resultMap>
<update id="updateStatusByAlarm">
update wl_equipment_specific_alarm set status = 0,recovery_date = now() where status = 1
update wl_equipment_specific_alarm set status = 0,recovery_date = now(),equipment_specific_index_value = false where status = 1
</update>
<select id="getEquipmentSpecAlarmByIotCode"
......
......@@ -344,7 +344,7 @@
es.realtime_iot_index_name AS 'indexName',
es.qr_code AS 'qrCode',
es.iot_code AS 'iotCode',
(SELECT IF(SUM( IF ( wesa.equipment_specific_index_value = 'true', 1, 0 ) ) > 0, 'true', 'false' ) AS indexValue FROM wl_equipment_specific_alarm wesa WHERE wesa.equipment_specific_id = es.id) AS 'value',
(SELECT IF(SUM( IF ( wesa.`status` = 1, 1, 0 ) ) > 0, 'true', 'false' ) AS indexValue FROM wl_equipment_specific_alarm wesa WHERE wesa.equipment_specific_id = es.id) AS 'value',
ei.is_alarm AS isAlarm,
ei.emergency_level_color AS 'emergencyLevelColor'
FROM
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment