Ver Fonte

作业点添加location,运单详情添加耗时

guoyong há 4 anos atrás
pai
commit
a4f0b8b1dc

+ 4 - 2
src/main/java/com/aoyang/tms/controller/WorkerController.java

@@ -84,6 +84,7 @@ public class WorkerController {
         WorkOrderVO vo = new WorkOrderVO();
         WorkOrder workerInfo1 = workOrderService.getById(workOrder.getId());
         if (workerInfo1 != null) {
+            //取ExecuteTime第一条GPS上报时间
             LocationVO locationVO = commonService.getLocationByDate(workerInfo1.getTruckId(), workerInfo1.getExecuteTime());
             if (locationVO != null) {
                 vo.setTime(DateUtils.betweenTime(locationVO.getDate(), LocalDateTime.now()));
@@ -299,6 +300,7 @@ public class WorkerController {
         } catch (UnsupportedEncodingException ignored) {
         }
         //TODO 1.车辆进入出车前检车状态,2.订单进入前往装车点状态,3.并记行车日志,4.创建行程周期
+        workOrder.setExecuteTime(LocalDateTime.now());
         Boolean flag = workerService.startOrder(userId, utf8Name, workOrder);
         return new Result<>(flag);
     }
@@ -383,7 +385,7 @@ public class WorkerController {
             utf8Name = URLDecoder.decode(userName, "UTF-8");
         } catch (UnsupportedEncodingException ignored) {
         }
-        //TODO 1.车辆进入收车后检查状态,2.订单完成状态,3.并记行车日志
+        //TODO 1.车辆进入收车后检查状态,2.并记行车日志
         Boolean flag = workerService.arriveTerminal(userId, utf8Name, workOrder);
         return new Result<>(flag);
     }
@@ -400,7 +402,7 @@ public class WorkerController {
             utf8Name = URLDecoder.decode(userName, "UTF-8");
         } catch (UnsupportedEncodingException ignored) {
         }
-        //TODO 1.车辆进入已经收车状态,2.订单完成状态,3.并记行车日志,4.结束当前行程周期(从收车中到出车检查也结束当前行程周期)
+        //TODO 1.车辆进入已经收车状态,3.并记行车日志,4.结束当前行程周期(从收车中到出车检查也结束当前行程周期)
         Boolean flag = workerService.finishWork(userId, utf8Name, workOrder);
         return new Result<>(flag);
     }

+ 1 - 0
src/main/java/com/aoyang/tms/service/impl/WorkerServiceImpl.java

@@ -174,6 +174,7 @@ public class WorkerServiceImpl implements WorkerService {
 
                 //2.订单完成状态
                 workOrder.setOrderStatus(WorkOrderEnum.COMPLETED.orderStatus());
+                workOrder.setCompleteTime(LocalDateTime.now());
                 workOrderService.updateById(workOrder);
 
                 //3.并记行车日志