Merge remote-tracking branch 'origin/master'

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

@@ -66,6 +66,7 @@ public class WorkerController {
     @Resource
     private TruckService truckService;
 
+
     @ApiOperation(value = "运力详情", notes = "卡车id必传，包含司机1姓名、司机2姓名、押运员姓名、车辆状态、位置经纬度、位置时间等信息")
     @PostMapping("/find_truck_info")
     public Result<WorkerInfo> findTruckInfo(@RequestHeader(value = "orgId") Long orgId,

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

@@ -38,8 +38,6 @@ public class WorkerServiceImpl implements WorkerService {
     @Resource
     private WorkOrderService workOrderService;
     @Resource
-    private TruckCheckInfoService truckCheckInfoService;
-    @Resource
     private WorkLogService workLogService;
 
     @Override
@@ -100,6 +98,7 @@ public class WorkerServiceImpl implements WorkerService {
                 workCycle.setStatus(1);
                 workCycle.setStartTrip(workOrderParam.getStartTrip());
                 workCycleService.save(workCycle);
+                log.info("startOrder workCycle:{}", JSON.toJSONString(workCycle));
 
                 workOrder.setCycleId(workCycle.getId());
 
@@ -212,6 +211,8 @@ public class WorkerServiceImpl implements WorkerService {
                 WorkCycle workCycle = workCycleService.getById(workOrder.getCycleId());
                 workCycle.setEndTrip(workOrderParam.getEndTrip());
                 workCycleService.updateById(workCycle);
+                log.info("submitResult workCycle:{}", JSON.toJSONString(workCycle));
+
                 //1.车辆进入作业中状态
                 Truck truck = truckService.getById(workOrder.getTruckId());
                 truck.setTmsStatus(TmsTruckStatus.WORKING);
@@ -279,6 +280,7 @@ public class WorkerServiceImpl implements WorkerService {
                 }
                 workCycle.setJingWeight(jingWeight);
                 workCycleService.updateById(workCycle);
+                log.info("finishOrder workCycle:{}", JSON.toJSONString(workCycle));
 
                 //3.并记行车日志
                 workOrder.setCreater(userId);
@@ -341,13 +343,17 @@ public class WorkerServiceImpl implements WorkerService {
             workOrderParam.setEndTrip(workOrderParam.getEndTrip());
             workOrderParam.setEndTripUrl(workOrderParam.getEndTripUrl());
             workOrderService.updateById(workOrderParam);
-            log.info("workOrderParam:{}", JSON.toJSONString(workOrderParam));
+            log.info("finishWork workOrderParam:{}", JSON.toJSONString(workOrderParam));
 
 
             //3.结束当前行程周期（从收车中到出车检查也结束当前行程周期）
             WorkCycle workCycle = workCycleService.findCurrentWorkCycle(workOrderParam.getTruckId());
+            workCycle.setOrgId(workOrderParam.getOrgId());
+            workCycle.setOrgName(workOrderParam.getOrgName());
+            workCycle.setShipperId(workOrderParam.getShipperId());
+            workCycle.setShipperName(workOrderParam.getShipperName());
             workCycle.setEndTime(LocalDateTime.now());
-            BeanUtils.copyProperties(truck, workCycle);
+            workCycle.setTruckId(workOrderParam.getTruckId());
             workCycle.setEndTrip(workOrderParam.getEndTrip());
             workCycle.setCarNumber(workOrderParam.getCarNumber());
             workCycle.setTrailerNumber(workOrderParam.getTrailerNumber());
@@ -356,7 +362,7 @@ public class WorkerServiceImpl implements WorkerService {
             workCycle.setEscortId(workOrderParam.getEscortId());
             workCycle.setEscortName(workOrderParam.getEscortName());
             workCycleService.updateById(workCycle);
-            log.info("workCycle:{}", JSON.toJSONString(workCycle));
+            log.info("finishWork workCycle:{}", JSON.toJSONString(workCycle));
 
 
             //4 记录日志
@@ -386,6 +392,7 @@ public class WorkerServiceImpl implements WorkerService {
                 workCycle.setUpdaterName(userName);
                 workCycle.setUpdateDate(LocalDateTime.now());
                 workCycleService.updateById(workCycle);
+                log.info("finishCycle workCycle:{}", JSON.toJSONString(workCycle));
 
                 //已收车
                 truck.setTmsStatus(TmsTruckStatus.DONE);