From c423224dbe37ea69c1a36c696f85490343e68c4c Mon Sep 17 00:00:00 2001
From: 姜友瑶 <935090232@qq.com>
Date: Tue, 09 Aug 2022 09:11:51 +0800
Subject: [PATCH] Merge branch 'developer'
---
zq-erp/src/main/java/com/matrix/system/hive/service/SysProjServicesService.java | 25 +++++++++++++++++++++++++
1 files changed, 25 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 95ec6b1..224b2cd 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
@@ -2,6 +2,8 @@
import com.matrix.core.pojo.PaginationVO;
import com.matrix.core.pojo.VerifyResult;
+import com.matrix.system.app.dto.ServiceOrderListDto;
+import com.matrix.system.app.vo.ServiceOrderListVo;
import com.matrix.system.hive.bean.SysProjServices;
import com.matrix.system.hive.plugin.util.BaseServices;
@@ -60,6 +62,8 @@
*/
public SysProjServices findById(Long id);
+ public List<SysProjServices> findByIds(List<Long> id);
+
/**
* 排班
*/
@@ -69,6 +73,13 @@
* 前台点击取消预约
*/
public int modifyCancelProjServices(SysProjServices projServices);
+
+ /**
+ * 删除服务单中明细， 即项目/套餐
+ * @param id
+ * @return
+ */
+ public int deleteProjServiceItemById(Long id);
/**
@@ -97,4 +108,18 @@
public VerifyResult checkArrears(SysProjServices sysProjServices);
public VerifyResult checkBalance(SysProjServices sysProjServices);
+
+
+ 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