Merge branch 'master' of auyen/tms into test

src/main/java/com/aoyang/tms/controller/WorkerController.java

@@ -195,7 +195,7 @@ public class WorkerController {
         restInfo.setCreateDate(LocalDateTime.now());
         Boolean flag = restInfoService.save(restInfo);
         workLogService.logWorkCycleInfo(WorkLogTypeEnum.REST_START, null, userId + "", utf8Name,
-                workCycle.getId() + "", workCycle.getTruckId() + "", getLocalDateTimeStr(restInfo.getEndTime()));
+                workCycle.getId() + "", workCycle.getTruckId() + "", getLocalDateTimeStr(restInfo.getStartTime()));
         workLogService.logWorkCycleInfo(WorkLogTypeEnum.REST_END, null, userId + "", utf8Name, workCycle.getId() + "",
                 workCycle.getTruckId() + "", getLocalDateTimeStr(restInfo.getEndTime()), DateUtils.betweenTime(restInfo.getStartTime(), restInfo.getEndTime()));
         return new Result<>(flag);
@@ -269,7 +269,7 @@ public class WorkerController {
         Boolean flag = truckCheckInfoService.saveOrUpdate(truckCheckInfo);
         if (Objects.equals(truckCheckInfo.getType(),3)) {
             workLogService.logWorkCycleInfo(WorkLogTypeEnum.CHECK_START, null, userId + "", utf8Name,
-                    workCycle.getId() + "", workCycle.getTruckId() + "", getLocalDateTimeStr(truckCheckInfo.getEndTime()));
+                    workCycle.getId() + "", workCycle.getTruckId() + "", getLocalDateTimeStr(truckCheckInfo.getStartTime()));
             workLogService.logWorkCycleInfo(WorkLogTypeEnum.CHECK_END, null, userId + "", utf8Name,
                     workCycle.getId() + "", workCycle.getTruckId() + "", getLocalDateTimeStr(truckCheckInfo.getEndTime()),
                     DateUtils.betweenTime(truckCheckInfo.getStartTime(), truckCheckInfo.getEndTime()));