feat:行车日志调整

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

@@ -186,8 +186,8 @@ public class WorkerController {
         restInfo.setCreaterName(utf8Name);
         restInfo.setCreateDate(LocalDateTime.now());
         Boolean flag = restInfoService.save(restInfo);
-        workLogService.logWorkCycleInfo(WorkLogTypeEnum.REST_START, null, workCycle.getId() + "");
-        workLogService.logWorkCycleInfo(WorkLogTypeEnum.REST_START, null, workCycle.getId() + "",
+        workLogService.logWorkCycleInfo(WorkLogTypeEnum.REST_START, null, workCycle.getId() + "", workCycle.getTruckId() + "");
+        workLogService.logWorkCycleInfo(WorkLogTypeEnum.REST_START, null, workCycle.getId() + "", workCycle.getTruckId() + "",
                 DateUtils.betweenTime(restInfo.getStartTime(), restInfo.getEndTime()));
         return new Result<>(flag);
     }
@@ -214,8 +214,8 @@ public class WorkerController {
         truckRepairInfo.setCreaterName(utf8Name);
         truckRepairInfo.setCreateDate(LocalDateTime.now());
         Boolean flag = truckRepairInfoService.save(truckRepairInfo);
-        workLogService.logWorkCycleInfo(WorkLogTypeEnum.REPAIR_START, null, workCycle.getId() + "");
-        workLogService.logWorkCycleInfo(WorkLogTypeEnum.REPAIR_START, null, workCycle.getId() + "",
+        workLogService.logWorkCycleInfo(WorkLogTypeEnum.REPAIR_START, null, workCycle.getId() + "", workCycle.getTruckId() + "");
+        workLogService.logWorkCycleInfo(WorkLogTypeEnum.REPAIR_START, null, workCycle.getId() + "", workCycle.getTruckId() + "",
                 DateUtils.betweenTime(truckRepairInfo.getStartTime(), truckRepairInfo.getEndTime()));
         return new Result<>(flag);
     }
@@ -500,6 +500,7 @@ public class WorkerController {
         truckCheckInfo.setCreateDate(LocalDateTime.now());
         truckCheckInfoService.save(truckCheckInfo);
         // 1.车辆进入已经收车状态，3.并记行车日志，4.结束当前行程周期（从收车中到出车检查也结束当前行程周期）
+        workOrder.setEndTrip(truckCheckInfo.getTrip());
         Boolean flag = workerService.finishWork(userId, utf8Name, workOrder);
         return new Result<>(flag);
     }

src/main/java/com/aoyang/tms/service/impl/WorkLogServiceImpl.java

@@ -109,7 +109,7 @@ public class WorkLogServiceImpl extends ServiceImpl<WorkLogMapper, WorkLog> impl
             queryWrapper.orderByDesc("id");
             queryWrapper.last("limit 1");
             WorkLog workLogArrived = this.baseMapper.selectOne(queryWrapper);
-            String content = "装车排队号：" + workOrder.getQueueNo();
+            String content = "装车排队号：" + workOrder.getQueueNo() + " <br/>里程数：" + workOrder.getEndTrip();
             workLogArrived.setNote(content);
             workLogArrived.setUrl(workOrder.getStartTripUrl());
             this.baseMapper.updateById(workLogArrived);
@@ -243,14 +243,14 @@ public class WorkLogServiceImpl extends ServiceImpl<WorkLogMapper, WorkLog> impl
         } else if (logType.equals(WorkLogTypeEnum.REPAIR_START) || logType.equals(WorkLogTypeEnum.REST_START)) {
             // 开始"途中维修"
             workLog.setCycleId(Long.parseLong(args[0]));
-            workLog.setId(null);
+            workLog.setTruckId(Long.parseLong(args[1]));
             workLog.setCreateDate(LocalDateTime.now());
         } else if (logType.equals(WorkLogTypeEnum.REPAIR_END) || logType.equals(WorkLogTypeEnum.REST_END)) {
             // 结束"途中维修"
             workLog.setCycleId(Long.parseLong(args[0]));
-            workLog.setId(null);
+            workLog.setTruckId(Long.parseLong(args[1]));
             // 日志内容
-            String content = "（用时" + args[0] + ")";
+            String content = "（用时" + args[2] + ")";
             workLog.setNote(content);
             workLog.setCreateDate(LocalDateTime.now());
         } else {

src/main/java/com/aoyang/tms/service/impl/WorkerServiceImpl.java

@@ -92,6 +92,7 @@ public class WorkerServiceImpl implements WorkerService {
                 BeanUtils.copyProperties(workOrder, workCycle);
                 //行车周期执行中
                 workCycle.setStatus(1);
+                workCycle.setStartTrip(workOrderParam.getStartTrip());
                 workCycleService.save(workCycle);
 
                 workOrder.setCycleId(workCycle.getId());
@@ -185,7 +186,6 @@ public class WorkerServiceImpl implements WorkerService {
         try {
             WorkOrder workOrder = workOrderService.getById(workOrderParam.getId());
             if (workOrder != null) {
-                workOrder.setQueueNo(workOrderParam.getQueueNo());
                 workOrder.setEndTrip(workOrderParam.getEndTrip());
                 workOrder.setEndTripUrl(workOrderParam.getEndTripUrl());
                 workOrder.setWorkStartTime(workOrderParam.getWorkStartTime());