From 1901a22a3b2d7a2a076b69ecd78d24ec55d5a3e8 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 22 八月 2024 18:26:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderMapper.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 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 2517f55..fdbf66b 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
@@ -4,9 +4,12 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ycl.platform.domain.entity.WorkOrder;
import com.ycl.platform.domain.query.*;
+import com.ycl.platform.domain.vo.DeviceInfoVO;
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;
@@ -53,12 +56,18 @@
* @param dashboardQuery 鏌ヨ鏉′欢
* @return 鏁版嵁
*/
- Map<String, Object> workOrderTotal(DashboardQuery dashboardQuery);
+ WorkOrderTotalVO workOrderTotal(DashboardQuery dashboardQuery);
/**
* 澶у睆宸ュ崟鍒嗗尯
* @param dashboardQuery 鏌ヨ鏉′欢
* @return 鏁版嵁
*/
- Map<String, Object> workOrderRegion(DashboardQuery dashboardQuery);
+ List<WorkOrderRegionVO> workOrderRegion(DashboardQuery dashboardQuery);
+
+ /**
+ * 鏌ヨ宸ュ崟璁惧淇℃伅
+ * @return
+ */
+ List<DeviceInfoVO> hasErrorWorkOrderList();
}
--
Gitblit v1.8.0