From b0d1fe4e0acb0fa40c684069c0e9d77d7a65ace3 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 17 十月 2023 15:53:53 +0800
Subject: [PATCH] fix
---
model/serviceOrder.go | 46 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 36 insertions(+), 10 deletions(-)
diff --git a/model/serviceOrder.go b/model/serviceOrder.go
index 92109e7..f593b5c 100644
--- a/model/serviceOrder.go
+++ b/model/serviceOrder.go
@@ -54,22 +54,26 @@
Solution string `gorm:"column:solution;type:varchar(255);not null;default:'';comment:瑙ｅ喅鏂规硶" json:"solution"` // 瑙ｅ喅鏂规硶
SolutionRemark string `gorm:"column:solution_remark;type:varchar(255);not null;default:'';comment:鍐呴儴澶囨敞" json:"solutionRemark"` // 鍐呴儴澶囨敞
Remark string `gorm:"column:remark;type:varchar(255);not null;default:'';comment:澶囨敞" json:"remark"` // 澶囨敞
+ CodeStandID string `json:"codeStandID" gorm:"column:code_stand_id;type:varchar(255);comment:缂栫爜id"`
+ CrmModel
}
// 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
+ Order string
}
)
-func (ServiceOrder) TableName() string {
+func (slf *ServiceOrder) TableName() string {
return "service_order"
}
@@ -85,10 +89,13 @@
db = db.Where("id = ?", slf.Id)
}
if slf.ServiceContractId != 0 {
- db = db.Where("service_contract_id = ?", slf.ServiceContractId)
+ db = db.Where("contract_id = ?", slf.ServiceContractId)
}
if slf.SalesDetailsId != 0 {
- db = db.Where("sales_details_id = ?", slf.SalesDetailsId)
+ db = db.Where("order_id = ?", slf.SalesDetailsId)
+ }
+ if slf.Order != "" {
+ db = db.Order(slf.Order)
}
if slf.Preload {
db = db.
@@ -122,6 +129,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
@@ -190,8 +201,18 @@
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
+}
+
+func (slf *ServiceOrderSearch) SetOrder(order string) *ServiceOrderSearch {
+ slf.Order = order
return slf
}
@@ -234,3 +255,8 @@
err := db.Find(&records).Error
return records, total, err
}
+
+func (slf *ServiceOrderSearch) UpdateByMap(data map[string]interface{}) error {
+ var db = slf.build()
+ return db.Updates(data).Error
+}
--
Gitblit v1.8.0