绑定押运员

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

@@ -80,7 +80,7 @@ public class TruckEscortController {
     public Result bind(@RequestHeader(value = "userId") Long userId,
                          @RequestHeader(value = "userName") String userName, @RequestHeader(value = "orgId") Long orgId,
                          @RequestBody TruckEscort param) {
-        log.info("修改车辆押运员,调用/tms/truck_escort/update,参数:{}", JSON.toJSONString(param));
+        log.info("车辆绑定押运员,调用/tms/truck_escort/bind_truck,参数:{}", JSON.toJSONString(param));
         if (param == null || param.getTruckId() == null) {
             return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
@@ -102,18 +102,7 @@ public class TruckEscortController {
         param.setUpdaterName(utf8Name);
         param.setUpdateDate(LocalDateTime.now());
 
-        if (param.getTruckId() != null) {
-            TruckEscort truckEscortParam = new TruckEscort();
-            truckEscortParam.setTruckId(param.getTruckId());
-            TruckEscort truckEscort = truckEscortService.findTruckEscort(truckEscortParam);
-            log.info("修改车辆押运员,调用/tms/truck_escort/update,truckEscortParam:{},结果truckEscort:{}", JSON.toJSONString(truckEscortParam), JSON.toJSONString(truckEscort));
-
-            if (truckEscort != null && !truckEscort.getEscortId().equals(param.getEscortId())) {
-                return new Result<>(ErrCodeEnum.ONLY_ONE_ESCORT.getCode(), ErrCodeEnum.ONLY_ONE_ESCORT.getMessage());
-
-            }
-        }
-        return new Result<>(truckEscortService.edit(param));
+        return new Result<>(truckEscortService.bindTruck(param));
     }
 
     @ApiOperation(value = "添加车辆押运员", notes = "必传参数:orgId,escortName,mobile")

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

@@ -57,6 +57,17 @@ public interface TruckEscortService extends IService<TruckEscort> {
      **/
     boolean add(TruckEscortAddParam param);
 
+
+    /**
+     * @return
+     * @Author guoyong
+     * @Description 车辆绑定、解绑押运员
+     * @Date 2022/5/6
+     * @Param
+     **/
+    boolean bindTruck(TruckEscort param);
+
+
     /**
      * @return
      * @Author chengang

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

@@ -144,6 +144,32 @@ public class TruckEscortServiceImpl extends ServiceImpl<TruckEscortMapper, Truck
     }
 
     @Override
+    public boolean bindTruck(TruckEscort param) {
+        //解绑，更新truck_escort、删除truck_driver表
+        if (param.getEscortId() == null) {
+            LambdaUpdateWrapper<TruckEscort> updateWrapper = new LambdaUpdateWrapper<>();
+            updateWrapper.eq(TruckEscort::getTruckId, param.getTruckId());
+            updateWrapper.set(TruckEscort::getTruckId, null);
+            updateWrapper.set(TruckEscort::getCarNumber, null);
+            updateWrapper.set(TruckEscort::getUpdater, param.getUpdater());
+            updateWrapper.set(TruckEscort::getUpdaterName, param.getUpdaterName());
+            updateWrapper.set(TruckEscort::getUpdateDate, param.getUpdateDate());
+            boolean flag = truckEscortMapper.update(param, updateWrapper) > 0 ? true : false;
+            return flag;
+        } else {
+            LambdaUpdateWrapper<TruckEscort> updateWrapper = new LambdaUpdateWrapper<>();
+            updateWrapper.eq(TruckEscort::getTruckId, param.getTruckId());
+            updateWrapper.set(TruckEscort::getTruckId, param.getTruckId());
+            updateWrapper.set(TruckEscort::getCarNumber, param.getCarNumber());
+            updateWrapper.set(TruckEscort::getUpdater, param.getUpdater());
+            updateWrapper.set(TruckEscort::getUpdaterName, param.getUpdaterName());
+            updateWrapper.set(TruckEscort::getUpdateDate, param.getUpdateDate());
+            boolean flag = truckEscortMapper.update(param, updateWrapper) > 0 ? true : false;
+            return flag;
+        }
+    }
+
+    @Override
     public boolean edit(TruckEscort param) {
         log.info("修改押运员，edit，参数:{}", JSON.toJSONString(param));
         User user = commonService.findUser(param.getEscortId());