From 530fed8ec225453572d57b15c200ab062c335457 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 01 十一月 2023 19:20:21 +0800
Subject: [PATCH] 公海member_id使用0
---
model/serviceOrder.go | 81 ++++++++++++++++++++++++++++++++++------
1 files changed, 69 insertions(+), 12 deletions(-)
diff --git a/model/serviceOrder.go b/model/serviceOrder.go
index eb50e1c..7af464a 100644
--- a/model/serviceOrder.go
+++ b/model/serviceOrder.go
@@ -38,7 +38,7 @@
SaleChance SaleChance `gorm:"foreignKey:SaleChanceId"`
FaultTypeId int `gorm:"column:severity_id;type:int;not null;default:0;comment:鏁呴殰绫诲埆id" json:"faultTypeId"` // 鏁呴殰绫诲埆id
FaultType FaultType `gorm:"foreignKey:FaultTypeId"`
- SeverityId int `gorm:"column:severity_id;type:int;not null;default:0;comment:涓ラ噸绋嬪害id" json:"severity"` // 涓ラ噸绋嬪害id
+ SeverityId int `gorm:"column:severity_order_id;type:int;not null;default:0;comment:涓ラ噸绋嬪害id" json:"severityId"` // 涓ラ噸绋嬪害id
Severity Severity `gorm:"foreignKey:SeverityId"`
ServiceOrderStatusId int `gorm:"column:service_order_status_id;type:int;not null;default:0;comment:鏈嶅姟鍗曠姸鎬乮d" json:"serviceOrderStatusId"` // 澶勭悊鐘舵��
ServiceOrderStatus ServiceOrderStatus `gorm:"foreignKey:ServiceOrderStatusId"`
@@ -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,17 +89,19 @@
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.
Preload("Client").
Preload("ServiceContract").
Preload("SalesDetails").
- Preload("Product").
Preload("ServiceType").
Preload("Contact").
Preload("ServiceMan").
@@ -123,6 +129,13 @@
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_order.service_man_id in ?", slf.ServiceManIds)
+ }
+ if slf.ServiceNumber != "" {
+ db = db.Where("service_number = ?", slf.ServiceNumber)
}
return db
@@ -191,8 +204,23 @@
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
+}
+
+func (slf *ServiceOrderSearch) SetNumber(number string) *ServiceOrderSearch {
+ slf.ServiceNumber = number
return slf
}
@@ -235,3 +263,32 @@
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
+}
+
+func (slf *ServiceOrderSearch) Count() (int64, error) {
+ var db = slf.build()
+ var total int64
+ err := db.Count(&total).Error
+ return total, err
+}
+
+func (slf *ServiceOrderSearch) MaxAutoIncr() (int, error) {
+ type Result struct {
+ Max int
+ }
+
+ var (
+ result Result
+ db = slf.build()
+ )
+
+ err := db.Select("MAX(id) as max").Scan(&result).Error
+ if err != nil {
+ return result.Max, fmt.Errorf("max err: %v", err)
+ }
+ return result.Max, nil
+}
--
Gitblit v1.8.0