From d268f82d25c25ebdc7a1ea30614f6cda6d3a9ae3 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 10 十月 2024 16:31:41 +0800
Subject: [PATCH] win库+大屏考核指标查询bug
---
ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderMapper.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 50 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..378fd6c 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,12 +4,18 @@
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.WorkOrderDetailVO;
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;
+import java.time.LocalDateTime;
+import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -23,6 +29,7 @@
public interface WorkOrderMapper extends BaseMapper<WorkOrder> {
IPage<WorkOrderVO> page(IPage page, @Param("query") WorkOrderQuery query);
+ List<WorkOrderVO> export(@Param("query") WorkOrderExportQuery query);
IPage<WorkOrderVO> distributePage(IPage page, @Param("query") DistributeWorkOrderQuery query);
@@ -53,12 +60,53 @@
* @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(@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);
+
+ /**
+ * 宸ュ崟鍙锋煡璇︽儏
+ *
+ * @param workOrderNo
+ * @return
+ */
+ WorkOrderDetailVO detailByNo(@Param("workOrderNo") String workOrderNo);
+
+ /**
+ * 琛ュ厖寮傚父鎭㈠鐩戞帶淇℃伅
+ * @param orders
+ * @return
+ */
+ List<WorkOrderVO> getRecoveryInfo(List<String> orders);
}
--
Gitblit v1.8.0