From 802908b3c244aa4a842eca2b6e3469866e388811 Mon Sep 17 00:00:00 2001
From: Qin Dong Ming <2720806930@qq.com>
Date: Thu, 22 Aug 2024 20:36:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E5=88=99=E5=BC=95=E6=93=8E=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/muyu/controller/EngIneController.java |  4 +-
 .../java/com/muyu/service/EngIneService.java  |  2 +-
 .../serviceImpl/EngIneServiceImpl.java        | 50 +++++++++----------
 3 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/cloud-etl-server/src/main/java/com/muyu/controller/EngIneController.java b/cloud-etl-server/src/main/java/com/muyu/controller/EngIneController.java
index 292768d..fdde7db 100644
--- a/cloud-etl-server/src/main/java/com/muyu/controller/EngIneController.java
+++ b/cloud-etl-server/src/main/java/com/muyu/controller/EngIneController.java
@@ -27,8 +27,8 @@ public class EngIneController extends BaseController {
     EngIneService engIneService;
 
     @GetMapping("/getMaintenanceList")
-    public Result<List<EngineMaintenance>> getMaintenanceList() {
-        List<EngineMaintenance> list = engIneService.list();
+    public Result<List<EngineMaintenance>> getMaintenanceList(@RequestBody  EngineMaintenance engineMaintenanceQueryReq) {
+        List<EngineMaintenance> list = engIneService.list(engineMaintenanceQueryReq);
         return Result.success(list);
     }
 }
diff --git a/cloud-etl-server/src/main/java/com/muyu/service/EngIneService.java b/cloud-etl-server/src/main/java/com/muyu/service/EngIneService.java
index af9c04c..77d02d2 100644
--- a/cloud-etl-server/src/main/java/com/muyu/service/EngIneService.java
+++ b/cloud-etl-server/src/main/java/com/muyu/service/EngIneService.java
@@ -14,5 +14,5 @@ import java.util.List;
  * @Date：2024/8/22 15:37
  */
 public interface EngIneService extends IService<EngineMaintenance> {
-    List<EngineMaintenance> list( );
+    List<EngineMaintenance> list(EngineMaintenance engineMaintenance);
 }
diff --git a/cloud-etl-server/src/main/java/com/muyu/service/serviceImpl/EngIneServiceImpl.java b/cloud-etl-server/src/main/java/com/muyu/service/serviceImpl/EngIneServiceImpl.java
index 965d650..f4374c9 100644
--- a/cloud-etl-server/src/main/java/com/muyu/service/serviceImpl/EngIneServiceImpl.java
+++ b/cloud-etl-server/src/main/java/com/muyu/service/serviceImpl/EngIneServiceImpl.java
@@ -26,33 +26,33 @@ public class EngIneServiceImpl extends ServiceImpl<EngineMapper, EngineMaintenan
     EngineMapper engineMapper;
 
     @Override
-    public List<EngineMaintenance> list( ) {
+    public List<EngineMaintenance> list(EngineMaintenance engineMaintenance) {
         LambdaQueryWrapper<EngineMaintenance> queryWrapper = new LambdaQueryWrapper<>();
 
-//
-//        if (StringUtils.isNotNull(engineMaintenance.getName())) {
-//            queryWrapper.like(EngineMaintenance::getName, engineMaintenance.getName());
-//        }
-//
-//        if (StringUtils.isNotNull(engineMaintenance.getType())) {
-//            queryWrapper.eq(EngineMaintenance::getType, engineMaintenance.getType());
-//        }
-//
-//        if (StringUtils.isNotNull(engineMaintenance.getScope())) {
-//            queryWrapper.eq(EngineMaintenance::getScope, engineMaintenance.getScope());
-//        }
-//
-//        if (StringUtils.isNotNull(engineMaintenance.getEngineCode())) {
-//            queryWrapper.eq(EngineMaintenance::getEngineCode, engineMaintenance.getEngineCode());
-//        }
-//
-//        if (StringUtils.isNotNull(engineMaintenance.getIsActivate())) {
-//            queryWrapper.eq(EngineMaintenance::getIsActivate, engineMaintenance.getIsActivate());
-//        }
-//
-//        if (StringUtils.isNotNull(engineMaintenance.getStatus())) {
-//            queryWrapper.eq(EngineMaintenance::getStatus, engineMaintenance.getStatus());
-//        }
+
+        if (StringUtils.isNotNull(engineMaintenance.getName())) {
+            queryWrapper.like(EngineMaintenance::getName, engineMaintenance.getName());
+        }
+
+        if (StringUtils.isNotNull(engineMaintenance.getType())) {
+            queryWrapper.eq(EngineMaintenance::getType, engineMaintenance.getType());
+        }
+
+        if (StringUtils.isNotNull(engineMaintenance.getScope())) {
+            queryWrapper.eq(EngineMaintenance::getScope, engineMaintenance.getScope());
+        }
+
+        if (StringUtils.isNotNull(engineMaintenance.getEngineCode())) {
+            queryWrapper.eq(EngineMaintenance::getEngineCode, engineMaintenance.getEngineCode());
+        }
+
+        if (StringUtils.isNotNull(engineMaintenance.getIsActivate())) {
+            queryWrapper.eq(EngineMaintenance::getIsActivate, engineMaintenance.getIsActivate());
+        }
+
+        if (StringUtils.isNotNull(engineMaintenance.getStatus())) {
+            queryWrapper.eq(EngineMaintenance::getStatus, engineMaintenance.getStatus());
+        }
 
         return list(queryWrapper);
     }