complete_time

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

@@ -39,6 +39,8 @@ public class WorkerController {
     @Resource
     private WorkCycleService workCycleService;
     @Resource
+    private WorkSpotService workSpotService;
+    @Resource
     private CommonService commonService;
     @Resource
     private TruckCheckInfoService truckCheckInfoService;
@@ -165,6 +167,17 @@ public class WorkerController {
         return new Result<>(flag);
     }
 
+    @ApiOperation(value = "查询作业点位置信息", notes = "spot_id必传")
+    @PostMapping("/find_work_spot_info")
+    public Result find_work_spot_info(@RequestBody WorkSpot workSpot) {
+        log.info("查询作业点位置信息,/tms/worker/find_work_spot_info，参数:{}", JSON.toJSONString(workSpot));
+        if (workSpot == null || workSpot.getSpotId() == null) {
+            return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        WorkSpot flag = workSpotService.getById(workSpot.getSpotId());
+        return new Result<>(flag);
+    }
+
     @ApiOperation(value = "获取行车日志列表", notes = "卡车id必传")
     @PostMapping("/work_log_list")
     public Result work_log_list(@RequestBody PageParam<WorkLog> pageParam) {
@@ -261,7 +274,7 @@ public class WorkerController {
     @PostMapping("/submit_result")
     public Result submit_result(@RequestBody WorkOrder workOrder) {
         log.info("上报成果，/tms/worker/submit_result，参数:{}", JSON.toJSONString(workOrder));
-        if (workOrder == null ||  workOrder.getId() == null) {
+        if (workOrder == null || workOrder.getId() == null) {
             return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
         //TODO 1.车辆进入作业中状态，2.订单进入成果报备中状态，3.并记行车日志
@@ -273,7 +286,7 @@ public class WorkerController {
     @PostMapping("/finish_order")
     public Result finish_order(@RequestBody WorkOrder workOrder) {
         log.info("确认完成运单，/tms/worker/finish_order，参数:{}", JSON.toJSONString(workOrder));
-        if (workOrder == null ||  workOrder.getId() == null) {
+        if (workOrder == null || workOrder.getId() == null) {
             return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
         //TODO 1.车辆进入收车中状态，2.订单完成状态，3.并记行车日志
@@ -285,7 +298,7 @@ public class WorkerController {
     @PostMapping("/arrive_terminal")
     public Result arrive_shouchedian(@RequestBody WorkOrder workOrder) {
         log.info("上报已到达收车点，/tms/worker/arrive_shouchedian，参数:{}", JSON.toJSONString(workOrder));
-        if (workOrder == null ||  workOrder.getId() == null) {
+        if (workOrder == null || workOrder.getId() == null) {
             return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
         //TODO 1.车辆进入收车后检查状态，2.订单完成状态，3.并记行车日志
@@ -297,7 +310,7 @@ public class WorkerController {
     @PostMapping("/finish_work")
     public Result finish_work(@RequestBody WorkOrder workOrder) {
         log.info("上报已到达收车点，/tms/worker/arrive_shouchedian，参数:{}", JSON.toJSONString(workOrder));
-        if (workOrder == null ||  workOrder.getId() == null) {
+        if (workOrder == null || workOrder.getId() == null) {
             return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
         //TODO 1.车辆进入已经收车状态，2.订单完成状态，3.并记行车日志，4.结束当前行程周期（从收车中到出车检查也结束当前行程周期）