Commit c6c8fd63 authored by chenzhao's avatar chenzhao

修改bug

parent 72f2c460
...@@ -174,7 +174,9 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ ...@@ -174,7 +174,9 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
list = equipmentSpecificAlarmLogService.getIsConfirmByAlarmId(equipmentSpecificAlarmId, "0"); list = equipmentSpecificAlarmLogService.getIsConfirmByAlarmId(equipmentSpecificAlarmId, "0");
} }
} }
switch ( ent.getConfirmType()){
if (ent.getType() != null){
switch ( ent.getType()){
case "火警": case "火警":
ent.setType("FIREALARM"); ent.setType("FIREALARM");
break; break;
...@@ -190,6 +192,7 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ ...@@ -190,6 +192,7 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
default: default:
ent.setType(""); ent.setType("");
} }
}
ent.setUpdateDate(new Date()); ent.setUpdateDate(new Date());
int i = 0 ; int i = 0 ;
......
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