Commit 75771fd9 authored by 麻笑宇's avatar 麻笑宇

25082 大屏-应急处置-中屏-解救被困乘客数下钻-困人救援-第4条数据点击详情服务器内部报错

bug修改
parent 0dd22bb6
......@@ -115,6 +115,9 @@ public class EmergencyBizServiceImpl {
AlertCalledFormDto alertCalledFormVo = getAlertCalledFormDto(id);
Map<String, Object> objectMap = Bean.BeantoMap(alertCalledFormVo.getAlertCalledDto());
List<FormValue> dynamicFormAlert = alertCalledFormVo.getDynamicFormAlert();
HashMap<String, Object> datas = new HashMap<>();
HashMap<String, Object> qrcode = new HashMap<>();
ArrayList<Map<String, Object>> records = new ArrayList<>();
jsonData.forEach(f -> {
Object o = objectMap.get(f.getKey());
if (!ObjectUtils.isEmpty(o)) {
......@@ -131,6 +134,13 @@ public class EmergencyBizServiceImpl {
try {
map = this.selectByAlertId(id);
}catch (Exception e){
datas.put("datas", records);
datas.put("title", "处置记录");
datas.put("renderType", "timeline");
keyinfoData.put("title", null);
keyinfoData.put("keyParams", jsonData);
keyinfoData.put("infoRecords", datas);
keyinfoData.put("qrcode", qrcode);
return keyinfoData;
}
// 根据设备id 获取使用单位信息
......@@ -159,8 +169,6 @@ public class EmergencyBizServiceImpl {
LambdaQueryWrapper<RepairConsult> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(RepairConsult::getParentId, id).orderByDesc(RepairConsult::getRecDate);
List<RepairConsult> list = repairConsultMapper.selectList(queryWrapper);
HashMap<String, Object> datas = new HashMap<>();
ArrayList<Map<String, Object>> records = new ArrayList<>();
list.forEach(r -> {
HashMap<String, Object> data = new HashMap<>();
data.put("label", r.getAlertStatus());
......@@ -169,7 +177,7 @@ public class EmergencyBizServiceImpl {
records.add(data);
});
// 96333码
HashMap<String, Object> qrcode = new HashMap<>();
if (!ObjectUtils.isEmpty(alertCalledFormVo.getAlertCalledDto())) {
qrcode.put("title", "96333码");
qrcode.put("value", alertCalledFormVo.getAlertCalledDto().getDeviceId());
......
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