设备文档管理及车辆文档管理添加模糊查询

dyrqcar/src/main/java/com/tofly/dyrqcar/controller/DeptCarController.java

@@ -33,17 +33,17 @@ public class DeptCarController {
 
     private final  DeptCarService deptCarService;
 
-    /**
-    * 分页查询
-    * @param page 分页对象
-    * @param deptCar 部门车辆管理表
-    * @return
-    */
-    @GetMapping("/page" )
-    @ApiOperation(value = "分页查询")
-    public ResultRespone getDeptCarPage(Page page, @ModelAttribute DeptCar deptCar) {
-      return ResultRespone.success(deptCarService.page(page, Wrappers.query(deptCar)));
-    }
+//    /**
+//    * 分页查询
+//    * @param page 分页对象
+//    * @param deptCar 部门车辆管理表
+//    * @return
+//    */
+//    @GetMapping("/page" )
+//    @ApiOperation(value = "分页查询")
+//    public ResultRespone getDeptCarPage(Page page, @ModelAttribute DeptCar deptCar) {
+//      return ResultRespone.success(deptCarService.page(page, Wrappers.query(deptCar)));
+//    }
 
 
     /**

dyrqcar/src/main/java/com/tofly/dyrqcar/custom/controller/CustomDeptCarController.java

@@ -7,6 +7,7 @@ package com.tofly.dyrqcar.custom.controller;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.tofly.common.core.entity.ResultRespone;
+import com.tofly.common.core.util.StringUtil;
 import com.tofly.common.log.annotation.ToFlyAppLog;
 import com.tofly.dyrqcar.custom.service.CustomDeptCarService;
 import com.tofly.dyrqcar.entity.DeptCar;
@@ -74,4 +75,17 @@ public class CustomDeptCarController {
     public ResultRespone removeById(String ids) {
         return ResultRespone.success(customDeptCarService.removeById(Arrays.asList(ids.split(","))));
     }
+
+    /**
+     * 分页查询
+     * @param page 分页对象
+     * @param deptCar 部门车辆管理表
+     * @return
+     */
+    @GetMapping("/page" )
+    @ApiOperation(value = "分页查询")
+    public ResultRespone getDeptCarPage(Page page, @ModelAttribute DeptCar deptCar) {
+        return ResultRespone.success(deptCarService.page(page, Wrappers.<DeptCar>lambdaQuery()
+                .like(StringUtil.isNotEmpty(deptCar.getName()),DeptCar::getName,deptCar.getName())));
+    }
 }

src/main/java/com/tofly/dyrq/controller/EpmtSystemController.java

@@ -33,17 +33,17 @@ public class EpmtSystemController {
 
     private final  EpmtSystemService epmtSystemService;
 
-    /**
-    * 分页查询
-    * @param page 分页对象
-    * @param epmtSystem 设备管理制度表
-    * @return
-    */
-    @GetMapping("/page" )
-    @ApiOperation(value = "分页查询")
-    public ResultRespone getEpmtSystemPage(Page page, @ModelAttribute EpmtSystem epmtSystem) {
-      return ResultRespone.success(epmtSystemService.page(page, Wrappers.query(epmtSystem)));
-    }
+//    /**
+//    * 分页查询
+//    * @param page 分页对象
+//    * @param epmtSystem 设备管理制度表
+//    * @return
+//    */
+//    @GetMapping("/page" )
+//    @ApiOperation(value = "分页查询")
+//    public ResultRespone getEpmtSystemPage(Page page, @ModelAttribute EpmtSystem epmtSystem) {
+//      return ResultRespone.success(epmtSystemService.page(page, Wrappers.query(epmtSystem)));
+//    }
 
 
     /**

src/main/java/com/tofly/dyrq/custom/controller/CustomEmptSystemController.java

@@ -1,18 +1,20 @@
 package com.tofly.dyrq.custom.controller;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.tofly.common.core.entity.ResultRespone;
+import com.tofly.common.core.util.StringUtil;
 import com.tofly.common.log.annotation.ToFlyAppLog;
 import com.tofly.dyrq.custom.service.CustomEpmtSystemService;
 import com.tofly.dyrq.entity.EpmtSystem;
+import com.tofly.dyrq.service.EpmtSystemService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.bouncycastle.math.ec.ECMultiplier;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.Arrays;
@@ -30,6 +32,7 @@ import java.util.Arrays;
 public class CustomEmptSystemController {
 
     private final CustomEpmtSystemService customEpmtSystemService;
+    private final EpmtSystemService epmtSystemService;
 
     /**
             * 新增设备管理制度表
@@ -69,4 +72,17 @@ public class CustomEmptSystemController {
     public ResultRespone removeById(String ids) {
         return ResultRespone.success(customEpmtSystemService.removeById(Arrays.asList(ids.split(","))));
     }
+
+    /**
+     * 分页查询
+     * @param page 分页对象
+     * @param epmtSystem 设备管理制度表
+     * @return
+     */
+    @GetMapping("/page" )
+    @ApiOperation(value = "分页查询")
+    public ResultRespone getEpmtSystemPage(Page page, @ModelAttribute EpmtSystem epmtSystem) {
+        return ResultRespone.success(epmtSystemService.page(page, Wrappers.<EpmtSystem>lambdaQuery()
+                .like(StringUtil.isNotEmpty(epmtSystem.getName()),EpmtSystem::getName,epmtSystem.getName())));
+    }
 }