From 697c874804efcb02f0b96de29d1e99bcac3eebb6 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 09 八月 2024 09:44:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
index 0178d13..0491c4f 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
@@ -13,6 +13,8 @@
import com.ycl.platform.domain.vo.WorkOrderVO;
import com.ycl.platform.domain.vo.WorkOrderYwConditionRecordVO;
import com.ycl.platform.domain.vo.screen.ScreenWorkOrderVO;
+import com.ycl.platform.domain.vo.screen.WorkOrderRegionVO;
+import com.ycl.platform.domain.vo.screen.WorkOrderTotalVO;
import com.ycl.platform.mapper.*;
import com.ycl.platform.service.NotifyService;
import com.ycl.platform.service.WorkOrderAuditingRecordService;
@@ -464,10 +466,12 @@
}
@Override
- public Map<String, Object> dashboard(DashboardQuery dashboardQuery) {
- HashMap<String, Object> map = new HashMap<>();
- map.put("workOrderTotal", baseMapper.workOrderTotal(dashboardQuery));
- map.put("workOrderRegion", baseMapper.workOrderRegion(dashboardQuery));
- return map;
+ public WorkOrderTotalVO workOrderTotal(DashboardQuery dashboardQuery) {
+ return baseMapper.workOrderTotal(dashboardQuery);
+ }
+
+ @Override
+ public List<WorkOrderRegionVO> workOrderRegion(DashboardQuery dashboardQuery) {
+ return baseMapper.workOrderRegion(dashboardQuery);
}
}
--
Gitblit v1.8.0