guzijian / bsth-alcohol-sign · Commits

Commit ff3c20728a64a460d988c6316cdec83166b615c3

Authored by guzijian
1 parent 5136dd88

fix: 跟班或者驾驶员为空时判断

Inline Side-by-side
Showing 1 changed file with 7 additions and 4 deletions
Bsth-admin/src/main/java/com/ruoyi/expand/service/impl/DriverSchedulingExpandServiceImpl.java
  View file @ff3c207
@@ -3,6 +3,7 @@ package com.ruoyi.expand.service.impl; @@ -3,6 +3,7 @@ package com.ruoyi.expand.service.impl;
3 import java.util.ArrayList; 3 import java.util.ArrayList;
4 import java.util.List; 4 import java.util.List;
5 import java.util.Map; 5 import java.util.Map;
  6 +import java.util.Objects;
6 import java.util.stream.Collectors; 7 import java.util.stream.Collectors;
7 8
8 import com.github.pagehelper.PageInfo; 9 import com.github.pagehelper.PageInfo;
@@ -69,10 +70,12 @@ public class DriverSchedulingExpandServiceImpl implements IDriverSchedulingExpan @@ -69,10 +70,12 @@ public class DriverSchedulingExpandServiceImpl implements IDriverSchedulingExpan
69 } 70 }
70 71
71 jobCodes = jobCodes.stream().distinct().collect(Collectors.toList()); 72 jobCodes = jobCodes.stream().distinct().collect(Collectors.toList());
72 - Map<String, Driver> driverMap = driverMapper.getNameByJobCode(jobCodes).stream().collect(Collectors.toMap(Driver::getJobCode,driver -> driver));  
73 - vos = vos.stream().peek(vo->{  
74 - vo.setMaster(vo.getMasterJobCode() + "/" + driverMap.get(vo.getMasterJobCode()).getPersonnelName());  
75 - vo.setSlave( vo.getSlaveJobCode() +"/"+driverMap.get(vo.getSlaveJobCode()).getPersonnelName()); 73 + Map<String, Driver> driverMap = driverMapper.getNameByJobCode(jobCodes).stream().collect(Collectors.toMap(Driver::getJobCode, driver -> driver));
  74 + vos = vos.stream().peek(vo -> {
  75 + Driver master = driverMap.get(vo.getMasterJobCode());
  76 + Driver slave = driverMap.get(vo.getSlaveJobCode());
  77 + vo.setMaster(vo.getMasterJobCode() + "/" + (Objects.isNull(master) ? null : master.getPersonnelName()));
  78 + vo.setSlave(vo.getSlaveJobCode() + "/" + (Objects.isNull(slave) ? null : slave.getPersonnelName()));
76 }).collect(Collectors.toList()); 79 }).collect(Collectors.toList());
77 80
78 return BaseController.getDataTable(vos, new PageInfo(expandList).getTotal()); 81 return BaseController.getDataTable(vos, new PageInfo(expandList).getTotal());