فهرست منبع

fix:途中行车日志bug

wangweiyu 4 سال پیش
والد
کامیت
1b7c20c540
1فایلهای تغییر یافته به همراه7 افزوده شده و 5 حذف شده
  1. 7 5
      src/main/java/com/aoyang/tms/controller/WorkerController.java

+ 7 - 5
src/main/java/com/aoyang/tms/controller/WorkerController.java

@@ -248,7 +248,7 @@ public class WorkerController {
     @ApiOperation(value = "上报车辆检查信息", notes = "新增或修改车辆检车信息")
     @PostMapping("/add_truck_check_info")
     public Result add_truck_check_info(@RequestHeader(value = "userId") Long userId, @RequestHeader(value = "userName") String userName, @RequestBody TruckCheckInfo truckCheckInfo) {
-        log.info("上报车辆检查信息,/tms/worker/add_truck_check_info,参数:{}", JSON.toJSONString(truckCheckInfo));
+        log.info("上报车辆检查信息,/tms/worker/add_truck_check_info,userId:{} 参数:{}", userId, JSON.toJSONString(truckCheckInfo));
         if (truckCheckInfo == null || truckCheckInfo.getType() == null || truckCheckInfo.getTruckId() == null || truckCheckInfo.getTrip() == null || StringUtils.isBlank(truckCheckInfo.getCheckUrl()) || StringUtils.isBlank(truckCheckInfo.getTripUrl())) {
             return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
@@ -258,11 +258,13 @@ public class WorkerController {
         } catch (UnsupportedEncodingException ignored) {
         }
 
-        WorkCycle workCycle = workCycleService.getById(truckCheckInfo.getCycleId());
-        if (workCycle != null) {
-            BeanUtils.copyProperties(workCycle, truckCheckInfo);
-            truckCheckInfo.setCycleId(workCycle.getId());
+        WorkCycle workCycle = workCycleService.getOne(
+                new QueryWrapper<WorkCycle>().eq("truck_id", truckCheckInfo.getTruckId()).eq("status", 1));
+        if (workCycle == null) {
+            return new Result(ErrCodeEnum.BAD_PARAM.getCode(), "行车周期状态错误");
         }
+        BeanUtils.copyProperties(workCycle, truckCheckInfo);
+        truckCheckInfo.setCycleId(workCycle.getId());
         truckCheckInfo.setCreater(userId);
         truckCheckInfo.setCreaterName(utf8Name);
         truckCheckInfo.setCreateDate(LocalDateTime.now());