Commit c12583ea authored by 高建强's avatar 高建强

item:应急处置完善角标信息

parent bda945aa
...@@ -220,10 +220,10 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService { ...@@ -220,10 +220,10 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
instanceInfo.setId(batchNo); instanceInfo.setId(batchNo);
instanceInfo.setName(detail.getPlanName()); instanceInfo.setName(detail.getPlanName());
instanceInfo.setOrgCode(detail.getOrgCode()); instanceInfo.setOrgCode(detail.getOrgCode());
WarehouseStructure warehouseStructure = warehouseStructureMapper.selectById(equipmentSpecific.getWarehouseStructureId()); // WarehouseStructure warehouseStructure = warehouseStructureMapper.selectById(equipmentSpecific.getWarehouseStructureId());
if (warehouseStructure != null) { // if (warehouseStructure != null) {
instanceInfo.setPosition(warehouseStructure.getName()); // instanceInfo.setPosition(warehouseStructure.getName());
} // }
contingencyInstanceInfoService.addDisposalDetails(instanceInfo); contingencyInstanceInfoService.addDisposalDetails(instanceInfo);
// 异步数据同步之消息发送 // 异步数据同步之消息发送
planOperationRecordDataSync(record); planOperationRecordDataSync(record);
...@@ -852,11 +852,13 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService { ...@@ -852,11 +852,13 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
PlanOperationRecord record = recordList.get(0); PlanOperationRecord record = recordList.get(0);
String batchNo = record.getBatchNo(); String batchNo = record.getBatchNo();
ContingencyInstanceInfo instanceInfo = contingencyInstanceInfoService.selectDisposalDetails(batchNo); ContingencyInstanceInfo instanceInfo = contingencyInstanceInfoService.selectDisposalDetails(batchNo);
if (instanceInfo != null) {
map.put("planName", instanceInfo.getName()); map.put("planName", instanceInfo.getName());
map.put("batchNo", batchNo); map.put("batchNo", batchNo);
List<ContingencyPlanInstance> list = planVisual3dService.selectDisposalActionList(batchNo, roleModelList, 1); List<ContingencyPlanInstance> list = planVisual3dService.selectDisposalActionList(batchNo, roleModelList, 1);
map.put("taskNum", list.size()); map.put("taskNum", list.size());
} }
}
return map; return map;
} }
......
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