|
|
@@ -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) {
|