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> getMaintenanceList() { - List list = engIneService.list(); + public Result> getMaintenanceList(@RequestBody EngineMaintenance engineMaintenanceQueryReq) { + List 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 { - List list( ); + List 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 list( ) { + public List list(EngineMaintenance engineMaintenance) { LambdaQueryWrapper 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); }