From f65ce9c19568745003b22e82060fb38c2885c701 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期五, 13 十月 2023 15:36:30 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/crm
---
model/serviceOrder.go | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/model/serviceOrder.go b/model/serviceOrder.go
index 0b012b5..16291f8 100644
--- a/model/serviceOrder.go
+++ b/model/serviceOrder.go
@@ -61,13 +61,14 @@
// ServiceOrderSearch 鏈嶅姟鍗曟悳绱㈡潯浠�
ServiceOrderSearch struct {
ServiceOrder
- Orm *gorm.DB
- QueryClass constvar.ServiceOrderQueryClass
- KeywordType constvar.ServiceOrderKeywordType
- Keyword string
- PageNum int
- PageSize int
- Preload bool
+ Orm *gorm.DB
+ QueryClass constvar.ServiceOrderQueryClass
+ KeywordType constvar.ServiceOrderKeywordType
+ Keyword string
+ PageNum int
+ PageSize int
+ Preload bool
+ ServiceManIds []int
}
)
@@ -124,6 +125,10 @@
db = db.Joins("ServiceType", clause.LeftJoin).Where("ServiceType.name like ?", fmt.Sprintf("%%%s%%", slf.Keyword))
case constvar.ServiceOrderKeywordFaultType:
db = db.Joins("FaultType", clause.LeftJoin).Where("FaultType.name like ?", fmt.Sprintf("%%%s%%", slf.Keyword))
+ }
+
+ if len(slf.ServiceManIds) > 0 {
+ db = db.Where("service_man_id in ?", slf.ServiceManIds)
}
return db
@@ -192,6 +197,11 @@
return slf
}
+func (slf *ServiceOrderSearch) SetMemberIds(memberIds []int) *ServiceOrderSearch {
+ slf.ServiceManIds = memberIds
+ return slf
+}
+
func (slf *ServiceOrderSearch) SetPreload(preload bool) *ServiceOrderSearch {
slf.Preload = preload
return slf
--
Gitblit v1.8.0