|
|
|
|
@ -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<WorkOrder> workOrders = workOrderService.list(Wrappers.lambdaQuery(WorkOrder.class).between(WorkOrder::getCreateTime, format.parse(startTime), format.parse(endTime))); |
|
|
|
|
List<MaintenanceTask> tasks = maintenanceTaskService.list(Wrappers.lambdaQuery(MaintenanceTask.class).between(MaintenanceTask::getCreateTime, format.parse(startTime), format.parse(endTime))); |
|
|
|
|
List<WorkOrder> workOrders = workOrderService.list(Wrappers.lambdaQuery(WorkOrder.class).between(StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime), WorkOrder::getCreateTime, format.parse(startTime), format.parse(endTime))); |
|
|
|
|
List<MaintenanceTask> tasks = maintenanceTaskService.list(Wrappers.lambdaQuery(MaintenanceTask.class).between(StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime), MaintenanceTask::getCreateTime, format.parse(startTime), format.parse(endTime))); |
|
|
|
|
List<Integer> total = new ArrayList<>(); |
|
|
|
|
total.add(workOrders.size()); |
|
|
|
|
total.add(tasks.size()); |
|
|
|
|
|