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
---
model/serviceOrder.go | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/model/serviceOrder.go b/model/serviceOrder.go
index 528b730..21cd7f1 100644
--- a/model/serviceOrder.go
+++ b/model/serviceOrder.go
@@ -17,10 +17,10 @@
ServiceNumber string `gorm:"column:service_number;type:varchar(255);not null;default:'';comment:鏈嶅姟鍗曠紪鍙�" json:"serviceNumber"` // 鏈嶅姟鍗曠紪鍙�
ClientId int `gorm:"column:client_id;type:int;not null;default:0;comment:瀹㈡埛id" json:"clientId"` // 瀹㈡埛id
Client Client `gorm:"foreignKey:ClientId"`
- ContractId int `gorm:"column:contract_id;type:int;not null;default:0;comment:鍚堝悓id" json:"contractId"` // 鍚堝悓id
- Contract Contract `gorm:"foreignKey:ContractId"`
- OrderId int `gorm:"column:order_id;type:int;not null;default:0;comment:閿�鍞鍗昳d" json:"orderId"` // 閿�鍞鍗昳d
- OrderManage OrderManage `gorm:"foreignKey:OrderId"`
+ ServiceContractId int `gorm:"column:contract_id;type:int;not null;default:0;comment:鏈嶅姟鍚堝悓id" json:"serviceContractId"` // 鏈嶅姟鍚堝悓id
+ ServiceContract ServiceContract `gorm:"foreignKey:ServiceContractId"`
+ SalesDetailsId int `gorm:"column:order_id;type:int;not null;default:0;comment:閿�鍞鍗昳d" json:"salesDetailsId"` // 閿�鍞槑缁唅d
+ SalesDetails SalesDetails `gorm:"foreignKey:SalesDetailsId"`
Subject string `gorm:"column:subject;type:varchar(255);not null;default:'';comment:涓婚" json:"subject"` // 涓婚
ProductId int `gorm:"column:product_id;type:int;not null;default:0;comment:浜у搧id" json:"productId"` // 浜у搧id
Product Product `gorm:"foreignKey:ProductId"`
@@ -39,7 +39,7 @@
FaultType FaultType `gorm:"foreignKey:FaultTypeId"`
SeverityId int `gorm:"column:severity_id;type:int;not null;default:0;comment:涓ラ噸绋嬪害id" json:"severity"` // 涓ラ噸绋嬪害id
Severity Severity `gorm:"foreignKey:SeverityId"`
- ServiceOrderStatusId int `gorm:"column:service_order_status_id;type:int;not null;default:0;comment:鏈嶅姟鍗曠姸鎬乮d" json:"status"` // 澶勭悊鐘舵��
+ ServiceOrderStatusId int `gorm:"column:service_order_status_id;type:int;not null;default:0;comment:鏈嶅姟鍗曠姸鎬乮d" json:"serviceOrderStatusId"` // 澶勭悊鐘舵��
ServiceOrderStatus ServiceOrderStatus `gorm:"foreignKey:ServiceOrderStatusId"`
ExpectTime string `gorm:"column:expect_time;type:varchar(255);not null;default:'';comment:甯屾湜澶勭悊鏃堕棿" json:"expectTime"` // 甯屾湜澶勭悊鏃堕棿
RealTime string `gorm:"column:real_time;type:varchar(255);not null;default:'';comment:瀹為檯澶勭悊鏃堕棿" json:"realTime"` // 瀹為檯澶勭悊鏃堕棿
@@ -82,6 +82,12 @@
var db = slf.Orm.Model(&ServiceOrder{})
if slf.Id != 0 {
db = db.Where("id = ?", slf.Id)
+ }
+ if slf.ServiceContractId != 0 {
+ db = db.Where("service_contract_id = ?", slf.ServiceContractId)
+ }
+ if slf.SalesDetailsId != 0 {
+ db = db.Where("sales_details_id = ?", slf.SalesDetailsId)
}
if slf.Preload {
db = db.
@@ -143,6 +149,16 @@
return slf
}
+func (slf *ServiceOrderSearch) SetServiceContractId(id int) *ServiceOrderSearch {
+ slf.ServiceContractId = id
+ return slf
+}
+
+func (slf *ServiceOrderSearch) SetSalesDetailsId(id int) *ServiceOrderSearch {
+ slf.SalesDetailsId = id
+ return slf
+}
+
func (slf *ServiceOrderSearch) SetPage(page, size int) *ServiceOrderSearch {
slf.PageNum, slf.PageSize = page, size
return slf
--
Gitblit v1.8.0