Merge remote-tracking branch 'origin/master'

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

@@ -427,7 +427,7 @@ public class WorkerController {
     @ApiOperation(value = "6.上报已到达收车点", notes = "点击上报已到达收车点")
     @PostMapping("/arrive_terminal")
     public Result arriveTerminal(@RequestHeader(value = "userId") Long userId, @RequestHeader(value = "userName") String userName, @RequestBody WorkOrder workOrder) {
-        log.info("上报已到达收车点，/tms/worker/arrive_shouchedian，参数:{}", JSON.toJSONString(workOrder));
+        log.info("上报已到达收车点，/tms/worker/arrive_terminal，参数:{}", JSON.toJSONString(workOrder));
         if (workOrder == null || workOrder.getId() == null) {
             return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
@@ -443,16 +443,22 @@ public class WorkerController {
 
     @ApiOperation(value = "7.完成检查，结束此次行程", notes = "点击完成检查，结束此次行程")
     @PostMapping("/finish_work")
-    public Result finishWork(@RequestHeader(value = "userId") Long userId, @RequestHeader(value = "userName") String userName, @RequestBody WorkOrder workOrder) {
-        log.info("上报已到达收车点，/tms/worker/arrive_shouchedian，参数:{}", JSON.toJSONString(workOrder));
-        if (workOrder == null || workOrder.getId() == null) {
+    public Result finishWork(@RequestHeader(value = "userId") Long userId, @RequestHeader(value = "userName") String userName, @RequestBody TruckCheckInfo truckCheckInfo) {
+        log.info("上报已到达收车点，/tms/worker/finish_work，参数:{}", JSON.toJSONString(truckCheckInfo));
+        if (truckCheckInfo == null || truckCheckInfo.getOrderId() == null || truckCheckInfo.getType() == null) {
             return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
+        WorkOrder workOrder = workOrderService.getById(truckCheckInfo.getOrderId());
         String utf8Name = userName;
         try {
             utf8Name = URLDecoder.decode(userName, "UTF-8");
         } catch (UnsupportedEncodingException ignored) {
         }
+        //保存收车检查信息
+        truckCheckInfo.setCreater(userId);
+        truckCheckInfo.setCreaterName(utf8Name);
+        truckCheckInfo.setCreateDate(LocalDateTime.now());
+        truckCheckInfoService.save(truckCheckInfo);
         // 1.车辆进入已经收车状态，3.并记行车日志，4.结束当前行程周期（从收车中到出车检查也结束当前行程周期）
         Boolean flag = workerService.finishWork(userId, utf8Name, workOrder);
         return new Result<>(flag);