From 60182903a0aa0a4fe08c719043d552284847ec5b Mon Sep 17 00:00:00 2001 From: litao Date: Wed, 27 Nov 2024 15:11:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/business/contraller/WorkBenchesController.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/springblade/modules/business/contraller/WorkBenchesController.java b/src/main/java/org/springblade/modules/business/contraller/WorkBenchesController.java index 4d1ccb8..6f48f31 100644 --- a/src/main/java/org/springblade/modules/business/contraller/WorkBenchesController.java +++ b/src/main/java/org/springblade/modules/business/contraller/WorkBenchesController.java @@ -1,5 +1,6 @@ package org.springblade.modules.business.contraller; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; @@ -108,8 +109,8 @@ public class WorkBenchesController extends BladeController { xData.add("报送维修"); xData.add("巡检维修"); map.put("xData", xData); - List workOrders = workOrderService.list(Wrappers.lambdaQuery(WorkOrder.class).between(WorkOrder::getCreateTime, format.parse(startTime), format.parse(endTime))); - List tasks = maintenanceTaskService.list(Wrappers.lambdaQuery(MaintenanceTask.class).between(MaintenanceTask::getCreateTime, format.parse(startTime), format.parse(endTime))); + List workOrders = workOrderService.list(Wrappers.lambdaQuery(WorkOrder.class).between(StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime), WorkOrder::getCreateTime, format.parse(startTime), format.parse(endTime))); + List tasks = maintenanceTaskService.list(Wrappers.lambdaQuery(MaintenanceTask.class).between(StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime), MaintenanceTask::getCreateTime, format.parse(startTime), format.parse(endTime))); List total = new ArrayList<>(); total.add(workOrders.size()); total.add(tasks.size());