From 5fb5605185db191834d2e98bc9f6e7bfa7af47c8 Mon Sep 17 00:00:00 2001 From: 龚焕茏 <2842157468@qq.com> Date: 星期一, 25 三月 2024 18:10:09 +0800 Subject: [PATCH] 事前事后报备增加筛选条件 --- ycl-pojo/src/main/java/com/ycl/platform/domain/query/ReportQuery.java | 3 +++ ycl-server/src/main/java/com/ycl/platform/controller/ReportController.java | 2 +- ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java | 2 ++ 3 files changed, 6 insertions(+), 1 deletions(-) diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/ReportQuery.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/ReportQuery.java index 4c14366..db59460 100644 --- a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/ReportQuery.java +++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/ReportQuery.java @@ -19,5 +19,8 @@ @Accessors(chain = true) @ApiModel(value = "Report鏌ヨ", description = "鎶ュ鏌ヨ") public class ReportQuery extends AbsQuery { + + private String reportType; + } diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/ReportController.java b/ycl-server/src/main/java/com/ycl/platform/controller/ReportController.java index 0fab314..092da5c 100644 --- a/ycl-server/src/main/java/com/ycl/platform/controller/ReportController.java +++ b/ycl-server/src/main/java/com/ycl/platform/controller/ReportController.java @@ -57,7 +57,7 @@ @PostMapping("/page") @ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉") - public Result page(ReportQuery query) { + public Result page(@RequestBody ReportQuery query) { return reportService.page(query); } diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java index 7e759e5..91a7e7c 100644 --- a/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java +++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java @@ -24,6 +24,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.Assert; import java.util.ArrayList; +import java.util.Objects; import java.util.stream.Collectors; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; @@ -112,6 +113,7 @@ public Result page(ReportQuery query) { IPage<Report> page = new LambdaQueryChainWrapper<>(baseMapper) + .eq(StringUtils.isNotBlank(query.getReportType()), Report::getReportType, query.getReportType()) .orderByDesc(Report::getCreateTime) .page(PageUtil.getPage(query, Report.class)); -- Gitblit v1.8.0