guoyong hace 4 años
padre
commit
9c47504f24

+ 2 - 2
src/main/java/com/aoyang/tms/controller/vo/WorkerInfo.java

@@ -78,8 +78,8 @@ public class WorkerInfo {
     @ApiModelProperty(value = "车辆状态,已收车0,出车前检查1,出车作业中2,收车中3,收车后检查4")
     private Integer truckStatus;
 
-    @ApiModelProperty(value = "已用时,单位分")
-    private int time;
+    @ApiModelProperty(value = "已用时,格式时分秒")
+    private String time;
 
     @ApiModelProperty(value = "直接返回文字空车或重车")
     private String isZhongche;

+ 5 - 0
src/main/java/com/aoyang/tms/service/impl/CommonServiceImpl.java

@@ -11,6 +11,7 @@ import com.aoyang.tms.feign.UserFeignClient;
 import com.aoyang.tms.feign.result.Org;
 import com.aoyang.tms.feign.result.TmsMongoDoc;
 import com.aoyang.tms.service.*;
+import com.aoyang.tms.util.DateUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.HttpEntity;
@@ -149,8 +150,12 @@ public class CommonServiceImpl implements CommonService {
         if (workOrder != null) {
             workerInfo.setOrderId(workOrder.getId());
             workerInfo.setOrderStatus(workOrder.getOrderStatus());
+
+            //已用时,从开始执行运单开始
+            workerInfo.setTime(DateUtils.betweenTime(workOrder.getWorkStartTime(), LocalDateTime.now()));
         }
 
+
         //查询当前行车周期
         WorkCycle workCycle = workCycleService.findCurrentWorkCycle(truckId);
         if (workCycle != null) {