From ea865027c9e115057644f59747f3bed2a8a963e6 Mon Sep 17 00:00:00 2001
From: 姜友瑶 <935090232@qq.com>
Date: Mon, 23 May 2022 15:15:28 +0800
Subject: [PATCH] Merge branch 'master' into feature/订单服务单代码改造

---
 zq-erp/src/main/java/com/matrix/system/hive/service/SysProjServicesService.java |   11 +++++++++++
 1 files changed, 11 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..871613a 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,15 @@
     List<ServiceOrderListVo> findApiServiceOrderListInPage(ServiceOrderListDto serviceOrderListDto, PaginationVO pageVo);
 
     int findApiServiceOrderListTotal(ServiceOrderListDto serviceOrderListDto);
+
+    public boolean skipServiceOrderStep(String step);
+
+    /**
+     * 确认服务单
+     * @param id
+     * @return
+     */
+    int confirmServiceOrder(Long id);
+
+    int signService(SysProjServices services);
 }
\ No newline at end of file

--
Gitblit v1.9.1