From b571b243fe34b63ced919cbf7c56da0e48dbdac4 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 30 九月 2024 00:38:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java b/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java
index e968d6d..88fb056 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java
@@ -7,6 +7,7 @@
import com.ycl.platform.domain.query.*;
import com.ycl.platform.domain.vo.DeviceInfoVO;
import com.ycl.platform.domain.vo.DistributeWorkOrderVO;
+import com.ycl.platform.domain.vo.WorkOrderVO;
import com.ycl.platform.domain.vo.WorkOrderYwConditionRecordVO;
import com.ycl.platform.domain.vo.screen.WorkOrderRegionVO;
import com.ycl.platform.domain.vo.screen.WorkOrderTotalVO;
@@ -191,7 +192,17 @@
String getFrameImgByDevice(String deviceId, String channelId, String workOrderNo);
/**
- * 鏌ヨ宸ュ崟锛氬凡涓嬪彂銆佸凡澶勭悊銆佸凡瀹屾垚鐨勫伐鍗�
+ * 宸ュ崟璁惧鐐规挱鑾峰彇涓�甯у浘鐗囷紝骞朵繚瀛樺埌鏁版嵁搴�
+ *
+ * @param deviceId 鍥芥爣璁惧鍥芥爣鐮�
+ * @param channelId 璁惧閫氶亾缂栧彿锛堣澶囧浗鏍囩爜锛�
+ * @param workOrderNo 宸ュ崟鍙�
+ * @return 鏁版嵁
+ */
+ void saveFrameImgByDevice(String deviceId, String channelId, String workOrderNo);
+
+ /**
+ * 鏌ヨ宸ュ崟锛氬緟瀹℃牳鐨勫伐鍗�
*
* @param start 寮�濮嬫椂闂�
* @param end 缁撴潫鏃堕棿
@@ -223,4 +234,6 @@
* @return
*/
Result detailByNo(String workOrderNo);
+
+ List<WorkOrderVO> export(WorkOrderExportQuery query);
}
--
Gitblit v1.8.0