From 75c1ea5b8b052aa153ab07a90db96cbbd636f426 Mon Sep 17 00:00:00 2001 From: wangxiang <1827945911@qq.com> Date: Mon, 17 Jul 2023 16:47:38 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E6=9E=B6=E6=9E=84=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ReportController.java} | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) rename kicc-platform/kicc-platform-biz/kicc-report-biz/src/main/java/com/cloud/kicc/report/{endpoint/ReportEndpoint.java => controller/ReportController.java} (77%) diff --git a/kicc-platform/kicc-platform-biz/kicc-report-biz/src/main/java/com/cloud/kicc/report/endpoint/ReportEndpoint.java b/kicc-platform/kicc-platform-biz/kicc-report-biz/src/main/java/com/cloud/kicc/report/controller/ReportController.java similarity index 77% rename from kicc-platform/kicc-platform-biz/kicc-report-biz/src/main/java/com/cloud/kicc/report/endpoint/ReportEndpoint.java rename to kicc-platform/kicc-platform-biz/kicc-report-biz/src/main/java/com/cloud/kicc/report/controller/ReportController.java index 12158e60..39734fea 100644 --- a/kicc-platform/kicc-platform-biz/kicc-report-biz/src/main/java/com/cloud/kicc/report/endpoint/ReportEndpoint.java +++ b/kicc-platform/kicc-platform-biz/kicc-report-biz/src/main/java/com/cloud/kicc/report/controller/ReportController.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.report.endpoint; +package com.cloud.kicc.report.controller; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -26,13 +26,15 @@ import java.util.Arrays; @RestController @AllArgsConstructor @RequestMapping(AppConstants.APP_REPORT + "/rest") -public class ReportEndpoint { +public class ReportController { private final IReportFileService service; - private LambdaQueryWrapper getQueryWrapper(ReportSystemFile reportFile) { + private LambdaQueryWrapper getQueryWrapper(ReportSystemFile reportSystemFile) { return new LambdaQueryWrapper() - .like(StrUtil.isNotBlank(reportFile.getName()), ReportSystemFile::getName, reportFile.getName()) + .like(StrUtil.isNotBlank(reportSystemFile.getName()), ReportSystemFile::getName, reportSystemFile.getName()) + .between(StrUtil.isNotBlank(reportSystemFile.getBeginTime()) && StrUtil.isNotBlank(reportSystemFile.getEndTime()), + ReportSystemFile::getCreateTime, reportSystemFile.getBeginTime(), reportSystemFile.getEndTime()) .orderByDesc(ReportSystemFile::getCreateTime); }