|
@@ -70,11 +70,16 @@ public class BackgroundProcessingController extends BaseRESTfulController {
|
|
|
resMap.put("code","500");
|
|
resMap.put("code","500");
|
|
|
return resMap;
|
|
return resMap;
|
|
|
}
|
|
}
|
|
|
- //查询车牌及司机id
|
|
|
|
|
|
|
+ //查询车牌及排班司机id
|
|
|
Map<String,Object> capacityMap = backgroundProcessingMapper.getCapacityMap(loginName);
|
|
Map<String,Object> capacityMap = backgroundProcessingMapper.getCapacityMap(loginName);
|
|
|
if(capacityMap != null){
|
|
if(capacityMap != null){
|
|
|
dataMap.putAll(capacityMap);
|
|
dataMap.putAll(capacityMap);
|
|
|
}
|
|
}
|
|
|
|
|
+ //查询登录账号人员id
|
|
|
|
|
+ Map<String,Object> personnelMap = backgroundProcessingMapper.getPersonnelMap(loginName);
|
|
|
|
|
+ if(personnelMap != null){
|
|
|
|
|
+ dataMap.putAll(personnelMap);
|
|
|
|
|
+ }
|
|
|
System.out.println(dataMap);
|
|
System.out.println(dataMap);
|
|
|
}
|
|
}
|
|
|
return resMap;
|
|
return resMap;
|