From d2d069b2fdb68b37c9f850b9798882d383c2fd51 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 03 九月 2024 11:42:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderMapper.java | 65 ++++++++++++++++++++++++++++----
1 files changed, 57 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..1625fb5 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,22 @@
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.DeviceInfoVO;
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.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
/**
* 宸ュ崟 Mapper 鎺ュ彛
@@ -43,4 +45,51 @@
* @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);
+
+ /**
+ * 鏌ヨ宸ュ崟璁惧淇℃伅
+ * @return
+ */
+ List<DeviceInfoVO> hasErrorWorkOrderList(@Param("start") Date start, @Param("end") Date end);
+
+ List<WorkOrderVO> selectPassOrder(@Param("startTime") LocalDateTime now, @Param("endTime")LocalDateTime thirtyDaysAgo, @Param("status") String status, @Param("auditStatus") String auditStatus);
+
+ int addMany(@Param("workOrderList") List<WorkOrder> workOrderList);
+
+ /**
+ * 鎵归噺淇敼鐘舵��
+ *
+ * @param workOrderList
+ * @return
+ */
+ int updateMany(List<WorkOrder> workOrderList);
+
+ /**
+ * 鑾峰彇鏈畬鎴愮殑宸ュ崟
+ *
+ * @param serialNumberList
+ * @return
+ */
+ List<WorkOrder> getNotFinishedWorkOrders(@Param("list") List<String> serialNumberList);
}
--
Gitblit v1.8.0