From 2a2885f45160b4048a27e75d5be03ba9232c7363 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 10 九月 2024 17:34:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderMapper.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 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 c1632e9..c37308f 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
@@ -5,6 +5,7 @@
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;
@@ -14,6 +15,7 @@
import org.apache.ibatis.annotations.Param;
import java.time.LocalDateTime;
+import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -70,7 +72,7 @@
* 鏌ヨ宸ュ崟璁惧淇℃伅
* @return
*/
- List<DeviceInfoVO> hasErrorWorkOrderList();
+ 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);
@@ -83,4 +85,20 @@
* @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);
}
--
Gitblit v1.8.0