feat:行车日志调整

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

@@ -78,7 +78,11 @@ public class WorkerServiceImpl implements WorkerService {
                     workCycleOld.setStatus(2);
                     workCycleOld.setEndTrip(workOrderParam.getStartTrip());
                     workCycleService.updateById(workCycleOld);
-                    workLogService.logWorkCycleInfo(WorkLogTypeEnum.LOAD_ORDER_NEW_START, workOrder);
+                    WorkOrder logOrder = new WorkOrder();
+                    BeanUtils.copyProperties(workOrder, logOrder);
+                    logOrder.setCreater(userId);
+                    logOrder.setCreaterName(userName);
+                    workLogService.logWorkCycleInfo(WorkLogTypeEnum.LOAD_ORDER_NEW_START, logOrder);
                 }
                 //1.车辆进入出车前检车状态
                 truck.setTmsStatus(TmsTruckStatus.PRE_CHECK);
@@ -106,6 +110,8 @@ public class WorkerServiceImpl implements WorkerService {
             workOrderService.updateById(workOrder);
 
             //插入日志
+            workOrder.setCreater(userId);
+            workOrder.setCreaterName(userName);
             workLogService.logWorkCycleInfo(WorkLogTypeEnum.LOAD_ORDER_START, workOrder);
 
         } else if (workOrder.getType() == 2) {
@@ -122,6 +128,8 @@ public class WorkerServiceImpl implements WorkerService {
             workOrderService.updateById(workOrder);
 
             //插入日志
+            workOrder.setCreater(userId);
+            workOrder.setCreaterName(userName);
             workLogService.logWorkCycleInfo(WorkLogTypeEnum.UNLOAD_ORDER_START, workOrder);
         }
 
@@ -141,6 +149,8 @@ public class WorkerServiceImpl implements WorkerService {
                 workOrder.setGotoSpotTime(LocalDateTime.now());
                 workOrderService.updateById(workOrder);
                 //4 记录日志
+                workOrder.setCreater(userId);
+                workOrder.setCreaterName(userName);
                 workLogService.logWorkCycleInfo(WorkLogTypeEnum.FINISH_PRE_CHECK, workOrder, truckCheckInfo.getCheckUrl());
             }
         } catch (Exception e) {
@@ -168,6 +178,8 @@ public class WorkerServiceImpl implements WorkerService {
                 workOrderService.updateById(workOrder);
 
                 //2 记录日志
+                workOrder.setCreater(userId);
+                workOrder.setCreaterName(userName);
                 if (workOrder.getType() == 1) {
                     workLogService.logWorkCycleInfo(WorkLogTypeEnum.LOAD_POINT_ARRIVED, workOrder);
                 } else {
@@ -206,6 +218,8 @@ public class WorkerServiceImpl implements WorkerService {
                 workOrderService.updateById(workOrder);
 
                 //3 记录日志
+                workOrder.setCreater(userId);
+                workOrder.setCreaterName(userName);
                 if (workOrder.getType() == 1) {
                     workLogService.logWorkCycleInfo(WorkLogTypeEnum.LOAD_START, workOrder);
                 } else {
@@ -260,6 +274,8 @@ public class WorkerServiceImpl implements WorkerService {
                 workCycleService.updateById(workCycle);
 
                 //3.并记行车日志
+                workOrder.setCreater(userId);
+                workOrder.setCreaterName(userName);
                 if (workOrder.getType() == 1) {
                     workLogService.logWorkCycleInfo(WorkLogTypeEnum.LOAD_END, workOrder);
                     workLogService.logWorkCycleInfo(WorkLogTypeEnum.LOAD_COMPLETE, workOrder);
@@ -289,6 +305,8 @@ public class WorkerServiceImpl implements WorkerService {
                 truck.setTmsStatus(TmsTruckStatus.AFTER_CHECK);
                 truckService.updateById(truck);
                 //2 记录日志
+                workOrder.setCreater(userId);
+                workOrder.setCreaterName(userName);
                 workLogService.logWorkCycleInfo(WorkLogTypeEnum.RETURN_POINT_ARRIVED, workOrder);
             }
         } catch (Exception e) {
@@ -327,6 +345,8 @@ public class WorkerServiceImpl implements WorkerService {
                 workCycleService.updateById(workCycle);
 
                 //4 记录日志
+                workOrder.setCreater(userId);
+                workOrder.setCreaterName(userName);
                 workLogService.logWorkCycleInfo(WorkLogTypeEnum.CLOSED, workOrder);
             }
         } catch (Exception e) {