From 1ae3f059e27fcfa6f1b46a9d36b0be1efa0e3172 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 13 八月 2024 14:41:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderMapper.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderMapper.java
index 603fb4f..cf2f65c 100644
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderMapper.java
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderMapper.java
@@ -3,13 +3,12 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ycl.platform.domain.entity.WorkOrder;
-import com.ycl.platform.domain.query.DistributeWorkOrderQuery;
-import com.ycl.platform.domain.query.HomeQuery;
-import com.ycl.platform.domain.query.ScreenQuery;
-import com.ycl.platform.domain.query.WorkOrderQuery;
+import com.ycl.platform.domain.query.*;
import com.ycl.platform.domain.vo.WorkOrderVO;
import com.ycl.platform.domain.vo.YwPointJobVO;
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 org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -50,4 +49,18 @@
* @return 鏁版嵁
*/
List<Map<String, Object>> home(HomeQuery monitorQuery);
+
+ /**
+ * 澶у睆宸ュ崟鎬绘暟
+ * @param dashboardQuery 鏌ヨ鏉′欢
+ * @return 鏁版嵁
+ */
+ WorkOrderTotalVO workOrderTotal(DashboardQuery dashboardQuery);
+
+ /**
+ * 澶у睆宸ュ崟鍒嗗尯
+ * @param dashboardQuery 鏌ヨ鏉′欢
+ * @return 鏁版嵁
+ */
+ List<WorkOrderRegionVO> workOrderRegion(DashboardQuery dashboardQuery);
}
--
Gitblit v1.8.0