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/receipt.go | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/model/receipt.go b/model/receipt.go
index bd862ba..50945d3 100644
--- a/model/receipt.go
+++ b/model/receipt.go
@@ -14,16 +14,20 @@
Receipt struct {
Id int `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
ClientId int `gorm:"column:client_id;type:int;not null;default 0;comment:瀹㈡埛id" json:"clientId"` // 瀹㈡埛id
+ Client Client `gorm:"foreignKey:ClientId" json:"client"` // 瀹㈡埛id
SourceType constvar.ReceiptSourceType `gorm:"column:source_type;type:int;not null;default 0;comment:鏉ユ簮绫诲瀷锛�1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓3閿�鍞彂绁�4鏀舵璁″垝5鍑哄簱鍗曪級" json:"sourceType"` // 鏉ユ簮绫诲瀷锛�1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓3閿�鍞彂绁�4鏀舵璁″垝5鍑哄簱鍗曪級
SourceId int `gorm:"column:source_id;type:int;not null;default 0;comment:婧愬崟id " json:"sourceId"` // 婧愬崟id
PrincipalId int `gorm:"column:principal_id;type:int;not null;default 0;comment:璐熻矗浜篿d" json:"principalId"` // 璐熻矗浜篿d
+ Principal User `gorm:"foreignKey:PrincipalId" json:"principal"` // 璐熻矗浜篿d
ReceiptDate string `gorm:"column:receipt_date;type:varchar(255);not null;default '';comment:鏀舵鏃ユ湡" json:"receiptDate"` // 鏀舵鏃ユ湡
MoneyType string `gorm:"column:money_type;type:varchar(255);not null;default '';comment:甯佺" json:"moneyType"` // 甯佺
Amount decimal.Decimal `gorm:"column:amount;type:decimal(12,2);not null;default '0.00';comment:鏀舵閲戦" json:"amount"` // 鏀舵閲戦
PaymentTypeId int `gorm:"column:payment_type_id;type:int;not null;default 0;comment:鏀舵鏂瑰紡ID" json:"paymentTypeId"` // 鏀舵鏂瑰紡ID
- BankAccountId int `gorm:"column:bank_account_id;type:int;not null;default 0;comment:璐︽埛id" json:"bankAccountId"` // 璐︽埛id
- Remark string `gorm:"column:remark;type:varchar(255);not null;default '';comment:澶囨敞" json:"remark"` // 澶囨敞
- FileId int `gorm:"column:file_id;type:int;not null;default 0;comment:闄勪欢id" json:"fileId"` // 闄勪欢id
+ PaymentType PaymentType `gorm:"foreignKey:PaymentTypeId" json:"paymentType"`
+ BankAccountId int `gorm:"column:bank_account_id;type:int;not null;default 0;comment:璐︽埛id" json:"bankAccountId"` // 璐︽埛id
+ BankAccount BankAccount `gorm:"foreignKey:BankAccountId" json:"bankAccount"`
+ Remark string `gorm:"column:remark;type:varchar(255);not null;default '';comment:澶囨敞" json:"remark"` // 澶囨敞
+ FileId int `gorm:"column:file_id;type:int;not null;default 0;comment:闄勪欢id" json:"fileId"` // 闄勪欢id
gorm.Model `json:"-"`
}
@@ -49,10 +53,31 @@
}
}
+func (slf *ReceiptSearch) SetSourceType(sourceType constvar.ReceiptSourceType) *ReceiptSearch {
+ slf.SourceType = sourceType
+ return slf
+}
+
+func (slf *ReceiptSearch) SetSourceId(sourceId int) *ReceiptSearch {
+ slf.SourceId = sourceId
+ return slf
+}
+
+func (slf *ReceiptSearch) SetPage(page, size int) *ReceiptSearch {
+ slf.PageNum, slf.PageSize = page, size
+ return slf
+}
+
func (slf *ReceiptSearch) build() *gorm.DB {
var db = slf.Orm.Model(&Receipt{})
if slf.Id != 0 {
db = db.Where("id = ?", slf.Id)
+ }
+ if slf.SourceType != 0 {
+ db = db.Where("source_type = ?", slf.SourceType)
+ }
+ if slf.SourceId != 0 {
+ db = db.Where("source_id = ?", slf.SourceId)
}
return db
@@ -131,7 +156,7 @@
db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)
}
- err := db.Find(&records).Error
+ err := db.Preload("Principal").Preload("Client").Preload("PaymentType").Preload("BankAccount").Find(&records).Error
return records, total, err
}
--
Gitblit v1.8.0