From 724674c54da32406a16264850c3719b2553aada6 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期四, 10 八月 2023 19:35:36 +0800
Subject: [PATCH] Merge branch 'master' into fly
---
service/serviceOrder.go | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/service/serviceOrder.go b/service/serviceOrder.go
index c33f292..cdfe5d9 100644
--- a/service/serviceOrder.go
+++ b/service/serviceOrder.go
@@ -1,6 +1,7 @@
package service
import (
+ "aps_crm/constvar"
"aps_crm/model"
"aps_crm/model/request"
"aps_crm/pkg/ecode"
@@ -29,8 +30,14 @@
return ecode.OK
}
-func (ServiceOrderService) GetServiceOrderList() ([]*model.ServiceOrder, int64, int) {
- list, total, err := model.NewServiceOrderSearch().SetPreload(true).Find()
+func (ServiceOrderService) GetServiceOrderList(page, pageSize int, queryClass constvar.ServiceOrderQueryClass, keywordType constvar.ServiceOrderKeywordType, keyword string) ([]*model.ServiceOrder, int64, int) {
+ list, total, err := model.NewServiceOrderSearch().
+ SetPage(page, pageSize).
+ SetKeyword(keyword).
+ SetKeywordType(keywordType).
+ SetQueryClass(queryClass).
+ SetPreload(true).
+ Find()
if err != nil {
return nil, 0, ecode.DBErr
}
--
Gitblit v1.8.0