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/mapper/WorkOrderMapper.java |   36 ++++++++++++++++++++++++++++--------
 1 files changed, 28 insertions(+), 8 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 e54598c..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
@@ -1,20 +1,19 @@
 package com.ycl.platform.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ycl.platform.domain.entity.WorkOrder;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ycl.platform.domain.query.DistributeWorkOrderQuery;
-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.form.WorkOrderForm;
-import java.util.List;
-
-import com.ycl.platform.domain.vo.WorkOrderYwConditionRecordVO;
 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;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * 宸ュ崟 Mapper 鎺ュ彛
@@ -43,4 +42,25 @@
      * @return
      */
     ScreenWorkOrderVO screenWorkOrder(@Param("query") ScreenQuery query);
+
+    /**
+     * 棣栭〉缁熻鏁版嵁
+     * @param monitorQuery 鏌ヨ鏉′欢
+     * @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