Commit 0cd3ddb3 authored by litengwei's avatar litengwei

中心BUG修改

parent 9140a2de
......@@ -160,7 +160,6 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
}
detailVo.setEquipInfo(equipInfoVo);
detailVo.setAlarmInfo(equipAlarm);
......@@ -176,38 +175,43 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
List<TableContentVo> contentVos = new ArrayList<>();
for (DynamicLabelEnum u : DynamicLabelEnum.values()) {
TableContentVo contentVo = new TableContentVo();
contentVo.setKey(u.getCode());
switch (u.getCode()) {
case "name":
contentVo.setLabel(u.getDescribe());
contentVo.setValue(equipInfoVo.getName());
contentVo.setType("text");
contentVo.setKey(u.getCode());
break;
case "code":
contentVo.setLabel(u.getDescribe());
contentVo.setValue(equipInfoVo.getCode());
contentVo.setType("text");
contentVo.setKey(u.getCode());
break;
case "position":
contentVo.setLabel(u.getDescribe());
contentVo.setValue(equipInfoVo.getPosition());
contentVo.setType("text");
contentVo.setKey(u.getCode());
break;
case "manufacturer":
contentVo.setLabel(u.getDescribe());
contentVo.setValue(equipInfoVo.getManufacturerName());
contentVo.setType("text");
contentVo.setKey(u.getCode());
break;
case "systemName":
contentVo.setLabel(u.getDescribe());
contentVo.setValue(equipInfoVo.getSystemName());
contentVo.setType("text");
contentVo.setKey(u.getCode());
break;
case "alarmContent":
if(!source.equalsIgnoreCase(RiskSourceTypeEnum.PATROL.getName()) && !source.equalsIgnoreCase(RiskSourceTypeEnum.SCRAP.getName())) {
contentVo.setLabel(u.getDescribe());
contentVo.setValue(equipAlarm.getAlarmContent());
contentVo.setType("text");
contentVo.setKey(u.getCode());
break;
} else {
break;
......@@ -217,6 +221,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
contentVo.setLabel(u.getDescribe());
contentVo.setValue(equipAlarm.getAlarmDate());
contentVo.setType("text");
contentVo.setKey(u.getCode());
break;
} else {
break;
......
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