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 | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/service/serviceOrder.go b/service/serviceOrder.go
index 60a6d5f..8de6e57 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,16 @@
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, 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
}
@@ -56,7 +65,7 @@
}
func (ServiceOrderService) UpdateServiceOrder(serviceOrder *model.ServiceOrder) int {
- err := model.NewServiceOrderSearch().Save(serviceOrder)
+ err := model.NewServiceOrderSearch().SetId(serviceOrder.Id).Save(serviceOrder)
if err != nil {
return ecode.DBErr
}
--
Gitblit v1.8.0