Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

mg

2022-10-12 3f9ebf19e687c33287b0eaec64d4564a212f57db

 ycl-platform/src/main/java/com/ycl/controller/carManage/CarManageController.java

@@ -35,7 +35,7 @@

    @ApiOperation(value = "查询执法车")
    @GetMapping("/query_enforce")
    public CommonResult searchEnforceCar(@RequestParam String carNum,
    public CommonResult searchEnforceCar(@RequestParam(required = false) String carNum,
                                         @RequestParam Integer size,
                                         @RequestParam Integer current) {
        Page<CarEnforcecar> carEnforcecarPage = new Page<>();
@@ -48,7 +48,7 @@

    @ApiOperation(value = "查询渣土车")
    @GetMapping("/query_slag")
    public CommonResult searchSlagCar(@RequestParam String carNum,
    public CommonResult searchSlagCar(@RequestParam(required = false) String carNum,
                                      @RequestParam Integer size,
                                      @RequestParam Integer current) {
        Page<CarSlagcar> carSlagcarPage = new Page<>();
@@ -57,6 +57,23 @@
        return CommonResult.success(iCarSlagcarService
                .page(carSlagcarPage, new LambdaQueryWrapper<CarSlagcar>()
                        .like(StringUtils.isNotBlank(carNum), CarSlagcar::getCarNumber, carNum)));
    }


    @ApiOperation(value = "查看详情执法车")
    @GetMapping("/query_enforce_one")
    public CommonResult searchEnforceCar(@RequestParam Integer id) {
        return CommonResult.success(iCarEnforcecarService
                .getOne(new LambdaQueryWrapper<CarEnforcecar>()
                        .eq(CarEnforcecar::getId, id)));
    }

    @ApiOperation(value = "查看详情渣土车")
    @GetMapping("/query_slag_one")
    public CommonResult searchSlagCar(@RequestParam Integer id) {
        return CommonResult.success(iCarSlagcarService
                .getOne(new LambdaQueryWrapper<CarSlagcar>()
                        .eq(CarSlagcar::getId, id)));
    }

    @ApiOperation("修改执法车")
@@ -90,7 +107,7 @@
    }

    @ApiOperation("删除渣土车")
    @DeleteMapping("/deletion_enforce")
    @DeleteMapping("/deletion_slag")
    public CommonResult deleteSlagCar(@RequestParam Integer id) {
        return CommonResult.success(iCarSlagcarService.removeById(id));
    }