From 3f9ebf19e687c33287b0eaec64d4564a212f57db Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期三, 12 十月 2022 16:59:57 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

---
 ycl-platform/src/main/java/com/ycl/controller/carManage/CarManageController.java |   23 ++++++++++++++++++++---
 1 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/ycl-platform/src/main/java/com/ycl/controller/carManage/CarManageController.java b/ycl-platform/src/main/java/com/ycl/controller/carManage/CarManageController.java
index e8d07f3..17c889f 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/carManage/CarManageController.java
+++ b/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 = "鏌ヨ娓e湡杞�")
     @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 = "鏌ョ湅璇︽儏娓e湡杞�")
+    @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("鍒犻櫎娓e湡杞�")
-    @DeleteMapping("/deletion_enforce")
+    @DeleteMapping("/deletion_slag")
     public CommonResult deleteSlagCar(@RequestParam Integer id) {
         return CommonResult.success(iCarSlagcarService.removeById(id));
     }

--
Gitblit v1.8.0