diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataVehicleController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataVehicleController.java index cd8869478..efa88aa0e 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataVehicleController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataVehicleController.java @@ -33,6 +33,7 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.apache.ibatis.annotations.Param; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.excel.util.ExcelUtil; import org.springblade.core.mp.support.Condition; @@ -126,8 +127,12 @@ public class BasicdataVehicleController extends BladeController { @GetMapping("/dictionary") @ApiOperationSupport(order = 10) @ApiOperation(value = "车辆信息表",notes = "传入code") - public R> dictionary() { - List dictionary = basicdataVehicleService.selectBasicdataVehicleDictionary(); + public R> dictionary(@RequestParam(value = "vehicleNub",required = false) String vehicleNub) { + + + log.info(">>>>112 {}",vehicleNub); + + List dictionary = basicdataVehicleService.selectBasicdataVehicleDictionary(vehicleNub); return R.data(dictionary); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java index de5335b82..0a3dad131 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java @@ -151,7 +151,8 @@ public class BasicdataWarehouseController extends BladeController { @GetMapping("/listName") @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入warehouseWarehouse") - public R> listName(String name) { + public R> listName(@RequestParam("name") String name) { + log.info(">>>>>>>>>>>>>传入warehouseWarehouse name {}",name); List pages = warehouseService.pageListName(name); return R.data(pages); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.java index f236a1cb7..03a894a10 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.java @@ -59,7 +59,7 @@ public interface BasicdataVehicleMapper extends BaseMapper selectBasicdataDictionary(); + List selectBasicdataDictionary(@Param("vehicleNub") String vehicleNub); List findCarListByName(@Param("carNumber") String carNumber); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.xml index 86f026e0c..f2a470fc5 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.xml @@ -176,6 +176,9 @@