Commit ba4e6be939650cea60f19735b578c8bb0b915690
Committed by
xp.Huang
1 parent
a1f6b323
fix:pc端首页告警数sql错误 同步与小程序逻辑一致
(cherry picked from commit 7869e114ca1292580528107f4c2db3c96a1972f4)
Showing
1 changed file
with
7 additions
and
5 deletions
... | ... | @@ -296,11 +296,13 @@ |
296 | 296 | </select> |
297 | 297 | |
298 | 298 | <select id="findDeviceAlarmInfoByCustomer" resultMap="baseHomePageTop"> |
299 | - SELECT COUNT(ID) AS sum_count, | |
300 | - SUM(CASE WHEN created_time >= #{todayTime} THEN 1 ELSE 0 END) AS today_add | |
301 | - FROM alarm | |
302 | - WHERE customer_id ::TEXT = #{customerId} | |
303 | - AND originator_type = 5; | |
299 | + SELECT COUNT(m.ID) AS sum_count, | |
300 | + SUM(CASE WHEN m.created_time >= #{todayTime} THEN 1 ELSE 0 END) AS today_add | |
301 | + FROM alarm m | |
302 | + LEFT JOIN tk_device d ON m.originator_id = d.tb_device_id::uuid | |
303 | + LEFT JOIN device bd ON bd.id = d.tb_device_id::uuid | |
304 | + WHERE bd.customer_id ::TEXT = #{customerId} | |
305 | + AND m.originator_type = 5; | |
304 | 306 | </select> |
305 | 307 | |
306 | 308 | <select id="findDeviceMessageInfoByTs" resultType="java.lang.Integer"> | ... | ... |