|
|
@@ -53,12 +53,14 @@ public class WorkCycleController {
|
|
|
}
|
|
|
WorkCycleVO workCycleVo = new WorkCycleVO();
|
|
|
WorkCycle workCycle = workCycleService.findCurrentWorkCycle(workCycleParam.getTruckId());
|
|
|
- BeanUtils.copyProperties(workCycle, workCycleVo);
|
|
|
- if (workCycle.getStatus() == 1) {
|
|
|
- workCycleVo.setTime(DateUtils.betweenTime(workCycle.getStartTime(), LocalDateTime.now()));
|
|
|
- }
|
|
|
- if (workCycle.getStatus() == 2) {
|
|
|
- workCycleVo.setTime(DateUtils.betweenTime(workCycle.getStartTime(), workCycle.getEndTime()));
|
|
|
+ if (workCycle != null) {
|
|
|
+ BeanUtils.copyProperties(workCycle, workCycleVo);
|
|
|
+ if (workCycle.getStatus() == 1) {
|
|
|
+ workCycleVo.setTime(DateUtils.betweenTime(workCycle.getStartTime(), LocalDateTime.now()));
|
|
|
+ }
|
|
|
+ if (workCycle.getStatus() == 2) {
|
|
|
+ workCycleVo.setTime(DateUtils.betweenTime(workCycle.getStartTime(), workCycle.getEndTime()));
|
|
|
+ }
|
|
|
}
|
|
|
return new Result<>(workCycleVo);
|
|
|
}
|