Skip to content

A
amos-boot-biz
Commit 38313f18 authored by chenzhao's avatar chenzhao
Browse files
Options

修改bug 10530 10529

parent b65f4927
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 8 deletions
amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml
View file @ 38313f18
...@@ -4802,9 +4802,7 @@ ...@@ -4802,9 +4802,7 @@
WHEN a.nowLevel IS NULL WHEN a.nowLevel IS NULL
OR a.minLevel IS NULL THEN OR a.minLevel IS NULL THEN
'--' '--'
WHEN IFNULL( a.minLevel, 0 ) > IFNULL( WHEN a.minLevel - a.nowLevel > 0 THEN
a.nowLevel,
IFNULL( a.minLevel, 0 )) THEN
'缺水' ELSE '正常' '缺水' ELSE '正常'
END END
) AS levelStatus, ) AS levelStatus,
...@@ -4872,9 +4870,7 @@ ...@@ -4872,9 +4870,7 @@
WHEN a.nowLevel IS NULL WHEN a.nowLevel IS NULL
OR a.minLevel IS NULL THEN OR a.minLevel IS NULL THEN
'--' '--'
WHEN IFNULL( a.minLevel, 0 ) > IFNULL( WHEN a.minLevel - a.nowLevel > 0 THEN
a.nowLevel,
IFNULL( a.minLevel, 0 )) THEN
'缺水' ELSE '正常' '缺水' ELSE '正常'
END END
) AS levelStatus, ) AS levelStatus,
...@@ -4925,11 +4921,11 @@ ...@@ -4925,11 +4921,11 @@
WHEN nowPressure IS NOT NULL WHEN nowPressure IS NOT NULL
AND minLevel IS NOT NULL AND minLevel IS NOT NULL
AND nowPressure >= minLevel THEN AND nowPressure - minLevel > 0 THEN
'正常' '正常'
WHEN nowPressure IS NOT NULL WHEN nowPressure IS NOT NULL
AND minLevel IS NOT NULL AND minLevel IS NOT NULL
AND minLevel > nowPressure THEN AND minLevel - nowPressure > 0 THEN
'压力低' ELSE '--' '压力低' ELSE '--'
END END
) AS `status` ) AS `status`
......
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