From f84d9c46574a2cd663105859035bc17891270923 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期一, 14 八月 2023 10:41:54 +0800
Subject: [PATCH] Merge branch 'master' into fly
---
service/serviceOrder.go | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/service/serviceOrder.go b/service/serviceOrder.go
index cdfe5d9..8de6e57 100644
--- a/service/serviceOrder.go
+++ b/service/serviceOrder.go
@@ -30,13 +30,15 @@
return ecode.OK
}
-func (ServiceOrderService) GetServiceOrderList(page, pageSize int, queryClass constvar.ServiceOrderQueryClass, keywordType constvar.ServiceOrderKeywordType, keyword string) ([]*model.ServiceOrder, int64, int) {
+func (ServiceOrderService) GetServiceOrderList(page, pageSize int, queryClass constvar.ServiceOrderQueryClass, keywordType constvar.ServiceOrderKeywordType, keyword string, serviceContractId, salesDetailsId int) ([]*model.ServiceOrder, int64, int) {
list, total, err := model.NewServiceOrderSearch().
SetPage(page, pageSize).
SetKeyword(keyword).
SetKeywordType(keywordType).
SetQueryClass(queryClass).
SetPreload(true).
+ SetServiceContractId(serviceContractId).
+ SetSalesDetailsId(salesDetailsId).
Find()
if err != nil {
return nil, 0, ecode.DBErr
--
Gitblit v1.8.0