endTrip

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

@@ -348,9 +348,13 @@ public class WorkerServiceImpl implements WorkerService {
             WorkCycle workCycle = workCycleService.findCurrentWorkCycle(workOrderParam.getTruckId());
             workCycle.setEndTime(LocalDateTime.now());
             BeanUtils.copyProperties(truck, workCycle);
-            BeanUtils.copyProperties(workOrderParam, workCycle);
             workCycle.setEndTrip(workOrderParam.getEndTrip());
-            workCycle.setId(workCycle.getId());
+            workCycle.setCarNumber(workOrderParam.getCarNumber());
+            workCycle.setTrailerNumber(workOrderParam.getTrailerNumber());
+            workCycle.setDriverIdOne(workOrderParam.getDriverIdOne());
+            workCycle.setDriverNameOne(workOrderParam.getDriverNameOne());
+            workCycle.setEscortId(workOrderParam.getEscortId());
+            workCycle.setEscortName(workOrderParam.getEscortName());
             workCycleService.updateById(workCycle);
             log.info("workCycle:{}", JSON.toJSONString(workCycle));