From b90a31431164b4b0756e4ef76f08b08953b8b04d Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 13 十月 2023 14:56:23 +0800
Subject: [PATCH] 服务合同简单数据权限
---
model/serviceContract.go | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/model/serviceContract.go b/model/serviceContract.go
index 93ec9c8..87f2744 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"`
@@ -35,12 +36,13 @@
ServiceTimes int `json:"serviceTimes" gorm:"column:service_times;type:int;comment:鏈嶅姟娆℃暟"`
Terms string `json:"terms" gorm:"column:terms;type:text;comment:鏉℃"`
Remark string `json:"remark" gorm:"column:remark;type:text;comment:澶囨敞"`
- AmountReceivable decimal.Decimal `gorm:"column:amount_receivable;type:decimal(12,2);comment:搴旀敹閲戦" json:"amountReceivable"` // 搴旀敹閲戦
- AmountReceived decimal.Decimal `gorm:"column:amount_received;type:decimal(12,2);comment:宸叉敹閲戦" json:"amountReceived"` // 宸叉敹閲戦
+ AmountReceivable decimal.Decimal `gorm:"column:amount_receivable;type:decimal(12,2);comment:搴旀敹閲戦" json:"amountReceivable"` // 搴旀敹閲戦
+ AmountReceived decimal.Decimal `gorm:"column:amount_received;type:decimal(12,2);comment:宸叉敹閲戦" json:"amountReceived"` // 宸叉敹閲戦
AmountInvoiced decimal.Decimal `gorm:"column:amount_invoiced;type:decimal(12,2);comment:宸插紑绁ㄩ噾棰�" json:"amountInvoiced"` // 宸插紑绁ㄩ噾棰�
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 {
@@ -53,10 +55,11 @@
PageNum int
PageSize int
Preload bool
+ MemberIds []int
}
)
-func (ServiceContract) TableName() string {
+func (slf *ServiceContract) TableName() string {
return "service_contract"
}
@@ -106,8 +109,16 @@
db = db.Where("amount_receivable = ?", slf.Keyword)
}
+
+ if len(slf.MemberIds) > 0 {
+ db = db.Where("member_id in ?", slf.MemberIds)
+ }
+
if slf.Preload {
db = db.
+ Preload("Client").
+ Preload("Member").
+ Preload("Contact").
Preload("SaleChance").
Preload("SalesDetails").
Preload("Quotation").
@@ -138,6 +149,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)
@@ -149,7 +166,7 @@
db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)
}
- err := db.Find(&records).Error
+ err := db.Order("id desc").Order("id desc").Find(&records).Error
return records, total, err
}
@@ -187,6 +204,11 @@
return slf
}
+func (slf *ServiceContractSearch) SetMemberIds(memberIds []int) *ServiceContractSearch {
+ slf.MemberIds = memberIds
+ return slf
+}
+
func (slf *ServiceContractSearch) SetPreload(preload bool) *ServiceContractSearch {
slf.Preload = preload
return slf
--
Gitblit v1.8.0