admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug修改

Browse Source
This commit is contained in:
guo 2024-03-15 09:18:07 +08:00
parent d82b5446de
commit 07146b5738
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/TowerServiceImpl.java
View File

@ -521,10 +521,12 @@ public class TowerServiceImpl extends ServiceImpl<TowerMapper, Tower> implements
} else { } else {
//从塔吊-人员考勤里面获取人员信息 //从塔吊-人员考勤里面获取人员信息
driverVO = towerWorkerAttendanceMapper.getNewestWorkerInfo(driver.getDevSn()); driverVO = towerWorkerAttendanceMapper.getNewestWorkerInfo(driver.getDevSn());
driverVO.setContinuousWorkingTimeName(TimeUtil.toHourMinSecond(driver.getContinuousWorkingTime())); if (driverVO != null) {
driverVO.setContinuousWorkingTimeName(TimeUtil.toHourMinSecond(driver.getContinuousWorkingTime()));
}
} }
return driverVO; return driverVO;
}).collect(Collectors.toList()); }).filter(Objects::nonNull).collect(Collectors.toList());
DevWorkerVO devWorker = new DevWorkerVO(tower.getDevName(), tower.getDevSn(), tower.getRegistNo(), tower.getFactoryName(), null, driverList, null); DevWorkerVO devWorker = new DevWorkerVO(tower.getDevName(), tower.getDevSn(), tower.getRegistNo(), tower.getFactoryName(), null, driverList, null);
TowerDataInfoDTO towerDataInfo = new TowerDataInfoDTO().setForearmLength(tower.getForearmLength()).setTowerHeight(tower.getTowerHeight()); TowerDataInfoDTO towerDataInfo = new TowerDataInfoDTO().setForearmLength(tower.getForearmLength()).setTowerHeight(tower.getTowerHeight());
if (newData != null) { if (newData != null) {