From c5a0eb549cba2cd358a2d0496c44f3a289f15d9c Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期一, 28 八月 2023 14:22:06 +0800
Subject: [PATCH] fix
---
model/serviceContract.go | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/model/serviceContract.go b/model/serviceContract.go
index 526b545..d4b8744 100644
--- a/model/serviceContract.go
+++ b/model/serviceContract.go
@@ -17,6 +17,7 @@
Client Client `json:"client" gorm:"foreignKey:ClientId"`
Number string `json:"number" gorm:"column:number;type:varchar(255);comment:鍚堝悓缂栧彿"`
MemberId int `json:"memberId" gorm:"column:member_id;type:int;comment:璐熻矗浜篿d"`
+ Member User `json:"member" gorm:"foreignKey:MemberId"`
ContactId int `json:"contactId" gorm:"column:contact_id;type:int;comment:鑱旂郴浜篿d"`
Contact Contact `json:"contact" gorm:"foreignKey:ContactId"`
SaleChanceId int `json:"saleChanceId" gorm:"column:sale_chance_id;type:int;comment:閿�鍞満浼歩d"`
@@ -41,7 +42,7 @@
AmountUnInvoiced decimal.Decimal `gorm:"column:amount_not_invoiced;type:decimal(12,2);comment:鏈紑绁ㄩ噾棰�" json:"amountUnInvoiced"` // 鏈紑绁ㄩ噾棰�
AmountTotal decimal.Decimal `gorm:"column:amount_total;type:decimal(12,2);comment:浠风◣鍚堣" json:"amountTotal"` // 浠风◣鍚堣
Products []*Product `json:"products" gorm:"many2many:service_contract_product;"`
- gorm.Model `json:"-"`
+ CrmModel
}
ServiceContractSearch struct {
@@ -57,7 +58,7 @@
}
)
-func (ServiceContract) TableName() string {
+func (slf *ServiceContract) TableName() string {
return "service_contract"
}
@@ -109,6 +110,9 @@
}
if slf.Preload {
db = db.
+ Preload("Client").
+ Preload("Member").
+ Preload("Contact").
Preload("SaleChance").
Preload("SalesDetails").
Preload("Quotation").
@@ -139,6 +143,12 @@
return db.Delete(&ServiceContract{}).Error
}
+func (slf *ServiceContractSearch) DeleteByIds(ids []int) error {
+ var db = slf.build()
+ db = db.Where("id in ?", ids)
+ return db.Delete(&ServiceContract{}).Error
+}
+
func (slf *ServiceContractSearch) Find() ([]*ServiceContract, int64, error) {
var db = slf.build()
var records = make([]*ServiceContract, 0)
--
Gitblit v1.8.0