Merge remote-tracking branch 'origin/master'

6 months ago · 07107d9979
parent b2b719c949 1e993b41ee
commit 07107d9979
1 changed files with 4 additions and 4 deletions
--- a/haiwei-manage/src/main/resources/mapper/manage/ApiMapper.xml
+++ b/haiwei-manage/src/main/resources/mapper/manage/ApiMapper.xml
@ -29,8 +29,8 @@
                       then '运行'
                   else
                       case
-                           when (select State from EEquipmentState where ID = #{param1}) = 'true' then '故障'
-                           else '停机'
+                           when (select State from EEquipmentState where ID = #{param1}) = 'true' then '停机'
+                           else '故障'
                           end
                   end as state,
               '一体机'   as name
@ -42,8 +42,8 @@
                       then '运行'
                   else
                       case
-                           when (select State from EEquipmentState where ID = #{param3}) = 'true' then '故障'
-                           else '停机'
+                           when (select State from EEquipmentState where ID = #{param3}) = 'true' then '停机'
+                           else '故障'
                           end
                   end as state,
               '切刀'    as name