From cc59bd70ca7a57330801617b910c029a07fa2b4f Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sat, 30 Oct 2021 09:39:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger
---
zq-erp/src/main/java/com/matrix/system/hive/service/SysProjServicesService.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/SysProjServicesService.java b/zq-erp/src/main/java/com/matrix/system/hive/service/SysProjServicesService.java
index 27ed849..6383e2d 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/SysProjServicesService.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/SysProjServicesService.java
@@ -111,4 +111,13 @@
List<ServiceOrderListVo> findApiServiceOrderListInPage(ServiceOrderListDto serviceOrderListDto, PaginationVO pageVo);
int findApiServiceOrderListTotal(ServiceOrderListDto serviceOrderListDto);
+
+ public boolean skipServiceOrderStep(String step);
+
+ /**
+ * 确认服务单
+ * @param id
+ * @return
+ */
+ int confirmServiceOrder(Long id);
}
\ No newline at end of file
--
Gitblit v1.9.1