设备台账 所属构筑物补充
正在显示
1 个修改的文件
包含
3 行增加
和
0 行删除
... | @@ -571,6 +571,7 @@ public class EquipmentController { | ... | @@ -571,6 +571,7 @@ public class EquipmentController { |
571 | Map<String, String> maintenanceCycleUnitVal2KeyMap = key2ValueService.dictKey2Val("loop_unit", false); | 571 | Map<String, String> maintenanceCycleUnitVal2KeyMap = key2ValueService.dictKey2Val("loop_unit", false); |
572 | Map<String, String> installVal2KeyMap = key2ValueService.dictKey2Val("equipment-installWay", false); | 572 | Map<String, String> installVal2KeyMap = key2ValueService.dictKey2Val("equipment-installWay", false); |
573 | Map<String, String> healthVal2KeyMap = key2ValueService.dictKey2Val("equipment_health_status", false); | 573 | Map<String, String> healthVal2KeyMap = key2ValueService.dictKey2Val("equipment_health_status", false); |
574 | Map<String, String> sysStructDictMap = key2ValueService.dictKey2Val("sysStructDict", false); | ||
574 | // 封装结果 | 575 | // 封装结果 |
575 | Page<Map<String, Map<String, Object>>> resPage = new Page<>(equipmentDTO.getPageNo(), equipmentDTO.getPageSize()); | 576 | Page<Map<String, Map<String, Object>>> resPage = new Page<>(equipmentDTO.getPageNo(), equipmentDTO.getPageSize()); |
576 | resPage.setTotal(mapPage.getTotal()); | 577 | resPage.setTotal(mapPage.getTotal()); |
... | @@ -604,6 +605,8 @@ public class EquipmentController { | ... | @@ -604,6 +605,8 @@ public class EquipmentController { |
604 | resMap.get(keys[0]).put(keys[1] + "_dictText", installVal2KeyMap.get(ConvertUtils.getString(value))); | 605 | resMap.get(keys[0]).put(keys[1] + "_dictText", installVal2KeyMap.get(ConvertUtils.getString(value))); |
605 | } else if ("equipmentHealthStatus".equals(keys[1])) { | 606 | } else if ("equipmentHealthStatus".equals(keys[1])) { |
606 | resMap.get(keys[0]).put(keys[1] + "_dictText", healthVal2KeyMap.get(ConvertUtils.getString(value))); | 607 | resMap.get(keys[0]).put(keys[1] + "_dictText", healthVal2KeyMap.get(ConvertUtils.getString(value))); |
608 | } else if ("structures".equals(keys[1])) { | ||
609 | resMap.get(keys[0]).put(keys[1] + "_dictText", sysStructDictMap.get(ConvertUtils.getString(value))); | ||
607 | } | 610 | } |
608 | } | 611 | } |
609 | resPage.getRecords().add(resMap); | 612 | resPage.getRecords().add(resMap); | ... | ... |
-
请 注册 或 登录 后发表评论