From 26e9d2d7953bcb8eecaa9f7ce0527abf64f73d0f Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 02 八月 2024 10:39:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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 eead1af..b0a89ce 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
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.platform.domain.form.*;
import com.ycl.platform.domain.query.DistributeWorkOrderQuery;
+import com.ycl.platform.domain.query.ScreenQuery;
import com.ycl.platform.domain.vo.DistributeWorkOrderVO;
import com.ycl.system.Result;
import com.ycl.platform.domain.query.WorkOrderQuery;
@@ -119,14 +120,7 @@
* @param id 宸ュ崟id
* @return 宸ュ崟杩愮淮鎯呭喌
*/
- Result selectYwConditionByYwId(String id);
-
- /**
- * 鑾峰彇宸ュ崟杩愮淮鎯呭喌璁板綍
- * @param id 宸ュ崟id
- * @return 宸ュ崟杩愮淮鎯呭喌璁板綍
- */
- Result selectYwConditionListByYwId(String id);
+ Result selectYwConditionByYwId(Integer id);
/**
* 鑾峰彇宸ュ崟杩愮淮瀹℃牳璁板綍
@@ -142,4 +136,10 @@
*/
Result selectedIdsDistribute(DistributeWorkOrderQuery query);
+ /**
+ * 澶у睆宸ュ崟缁熻
+ * @param query
+ * @return
+ */
+ Result screenWorkOrder(ScreenQuery query);
}
--
Gitblit v1.8.0