Merge remote-tracking branch 'origin/master'

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

@@ -97,7 +97,7 @@ public class TruckEscortController {
     public Result update(@RequestHeader(value = "userId") Long userId,
                          @RequestHeader(value = "userName") String userName,
                          @RequestBody TruckEscort param) {
-        log.info("修改作业点,调用/tms/truck_escort/update,参数:{}", JSON.toJSONString(param));
+        log.info("修改车辆押运员,调用/tms/truck_escort/update,参数:{}", JSON.toJSONString(param));
         if (param == null || param.getEscortId() == null) {
             return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
@@ -134,4 +134,14 @@ public class TruckEscortController {
         return new Result<>(truckEscortService.getById(param));
     }
 
+    @ApiOperation(value = "获取没有绑定卡车的押运员列表", notes = "必传参数:orgId,选填参数:keyWord(查escortName,mobile)")
+    @PostMapping("/no_truck_list")
+    public Result noTruckList(@RequestBody TruckEscortListParam param) {
+        log.info("获取没有绑定卡车的押运员列表,调用/tms/truck_escort/no_truck_list,参数:{}", JSON.toJSONString(param));
+        if (param == null || param.getOrgId() == null) {
+            return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        return new Result<>(truckEscortService.noTruckList(param));
+    }
+
 }

src/main/java/com/aoyang/tms/service/TruckEscortService.java

@@ -66,4 +66,13 @@ public interface TruckEscortService extends IService<TruckEscort> {
      **/
     boolean edit(TruckEscort param);
 
+    /**
+     * @return
+     * @Author chengang
+     * @Description 获取没有绑定卡车的押运员列表
+     * @Date 2021/11/9
+     * @Param
+     **/
+    List<TruckEscort> noTruckList(TruckEscortListParam param);
+
 }

src/main/java/com/aoyang/tms/service/impl/TruckEscortServiceImpl.java

@@ -132,4 +132,21 @@ public class TruckEscortServiceImpl extends ServiceImpl<TruckEscortMapper, Truck
         }
         return updateById(param);
     }
+
+    @Override
+    public List<TruckEscort> noTruckList(TruckEscortListParam param) {
+        QueryWrapper<TruckEscort> queryWrapper = new QueryWrapper<>();
+        if (param.getOrgId() != null) {
+            queryWrapper.eq("org_id", param.getOrgId());
+        }
+        queryWrapper.isNull("truck_id");
+        if (param.getCarNumber() != null) {
+            queryWrapper.like("car_number", param.getCarNumber());
+        }
+        if (param.getKeyWord() != null) {
+            queryWrapper.like("escort_name", param.getKeyWord()).or().like("mobile", param.getKeyWord());
+        }
+        List<TruckEscort> list = list(queryWrapper.orderByDesc("update_date"));
+        return list;
+    }
 }