From e2edaf30f4bf2213fe55c9817980001a1ea23e9f Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期三, 19 二月 2025 09:26:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderMapper.java | 12 ++++++++++--
1 files changed, 10 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 7583ad6..9b48848 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
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ycl.platform.domain.entity.WorkOrder;
+import com.ycl.platform.domain.excel.WorkOrderWhiteExport;
import com.ycl.platform.domain.form.WorkOrderBatchAuditingForm;
import com.ycl.platform.domain.query.*;
import com.ycl.platform.domain.vo.DeviceInfoVO;
@@ -76,7 +77,7 @@
*/
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);
+ List<WorkOrderVO> selectPassOrder(@Param("startTime") LocalDateTime now, @Param("endTime")LocalDateTime thirtyDaysAgo, @Param("status") String status, @Param("errorList") List<String> errorList,@Param("auditStatus") String auditStatus);
int addMany(@Param("workOrderList") List<WorkOrder> workOrderList);
@@ -111,6 +112,13 @@
*/
List<WorkOrderVO> getRecoveryInfo(List<String> orders);
- List<WorkOrder> batchGetByError(@Param("form") WorkOrderBatchAuditingForm form);
+ List<WorkOrder> selectByNos(@Param("workOrderNos") List<String> workOrderNos);
+
+
+ List<String> getOfflineWorkOrder();
+
+ List<WorkOrderVO> getAuditTimeList(@Param("workOrderNos")List<String> workOrderNos);
+
+ List<WorkOrderVO> getHandleTimeList(@Param("workOrderNos")List<String> workOrderNos);
}
--
Gitblit v1.8.0