From 6194956fa9d039eda543bc292e456909787eb066 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 16 十月 2023 14:49:58 +0800
Subject: [PATCH] Revert "aps grpc env"
---
service/serviceOrder.go | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/service/serviceOrder.go b/service/serviceOrder.go
index 298afb2..6598ad0 100644
--- a/service/serviceOrder.go
+++ b/service/serviceOrder.go
@@ -38,7 +38,7 @@
return ecode.OK
}
-func (ServiceOrderService) GetServiceOrderList(page, pageSize int, queryClass constvar.ServiceOrderQueryClass, keywordType constvar.ServiceOrderKeywordType, keyword string, serviceContractId, salesDetailsId int) ([]*model.ServiceOrder, int64, int) {
+func (ServiceOrderService) GetServiceOrderList(page, pageSize int, queryClass constvar.ServiceOrderQueryClass, keywordType constvar.ServiceOrderKeywordType, keyword string, serviceContractId, salesDetailsId int, memberIds []int) ([]*model.ServiceOrder, int64, int) {
list, total, err := model.NewServiceOrderSearch().
SetPage(page, pageSize).
SetKeyword(keyword).
@@ -47,6 +47,7 @@
SetPreload(true).
SetServiceContractId(serviceContractId).
SetSalesDetailsId(salesDetailsId).
+ SetMemberIds(memberIds).
Find()
if err != nil {
return nil, 0, ecode.DBErr
@@ -73,7 +74,7 @@
}
func (ServiceOrderService) UpdateServiceOrder(serviceOrder *model.ServiceOrder) int {
- err := model.NewServiceOrderSearch().SetId(serviceOrder.Id).Save(serviceOrder)
+ err := model.NewServiceOrderSearch().SetId(serviceOrder.Id).Updates(serviceOrder)
if err != nil {
return ecode.DBErr
}
--
Gitblit v1.8.0