From 5f0170df9787c6f3ff17cc168b3f2e3f511453f6 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 31 十月 2023 20:04:16 +0800
Subject: [PATCH] 支持职级降级的情况
---
model/serviceContract.go | 76 +++++++++++++++++++++++++++++++++++--
1 files changed, 71 insertions(+), 5 deletions(-)
diff --git a/model/serviceContract.go b/model/serviceContract.go
index 87f2744..61d8e5f 100644
--- a/model/serviceContract.go
+++ b/model/serviceContract.go
@@ -36,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"` // 浠风◣鍚堣
+ AmountTotal decimal.Decimal `gorm:"column:amount_total;type:decimal(12,2);comment:浠风◣鍚堣" json:"amountTotal"` // 浠风◣鍚堣
Products []*Product `json:"products" gorm:"many2many:service_contract_product;"`
+ CodeStandID string `json:"codeStandID" gorm:"column:code_stand_id;type:varchar(255);comment:缂栫爜id"`
CrmModel
}
@@ -111,7 +112,7 @@
}
if len(slf.MemberIds) > 0 {
- db = db.Where("member_id in ?", slf.MemberIds)
+ db = db.Where("service_contract.member_id in ?", slf.MemberIds)
}
if slf.Preload {
@@ -131,6 +132,22 @@
Preload("Contact")
}
+ if slf.SalesDetailsId != 0 {
+ db = db.Where("sales_details_id = ?", slf.SalesDetailsId)
+ }
+
+ if slf.QuotationId != 0 {
+ db = db.Where("quotation_id = ?", slf.QuotationId)
+ }
+ if slf.SaleChanceId != 0 {
+ db = db.Where("sale_chance_id = ?", slf.SaleChanceId)
+ }
+ if slf.ContactId != 0 {
+ db = db.Where("contact_id = ?", slf.ContactId)
+ }
+ if slf.Number != "" {
+ db = db.Where("number = ?", slf.Number)
+ }
return db
}
@@ -166,8 +183,37 @@
db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)
}
- err := db.Order("id desc").Order("id desc").Find(&records).Error
+ err := db.Order("id desc").Find(&records).Error
return records, total, err
+}
+
+func (slf *ServiceContractSearch) Count() (int64, error) {
+ var db = slf.build()
+ var total int64
+ err := db.Count(&total).Error
+ return total, err
+}
+
+func (slf *ServiceContractSearch) 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
+}
+
+func (slf *ServiceContractSearch) SetNumber(number string) *ServiceContractSearch {
+ slf.Number = number
+ return slf
}
func (slf *ServiceContractSearch) SetId(id int) *ServiceContractSearch {
@@ -209,6 +255,26 @@
return slf
}
+func (slf *ServiceContractSearch) SetSalesDetailsId(salesDetailsId int) *ServiceContractSearch {
+ slf.SalesDetailsId = salesDetailsId
+ return slf
+}
+
+func (slf *ServiceContractSearch) SetQuotationId(quotationId int) *ServiceContractSearch {
+ slf.QuotationId = quotationId
+ return slf
+}
+
+func (slf *ServiceContractSearch) SetSaleChanceId(saleChanceId int) *ServiceContractSearch {
+ slf.SaleChanceId = saleChanceId
+ return slf
+}
+
+func (slf *ServiceContractSearch) SetContactId(contactId int) *ServiceContractSearch {
+ slf.ContactId = contactId
+ return slf
+}
+
func (slf *ServiceContractSearch) SetPreload(preload bool) *ServiceContractSearch {
slf.Preload = preload
return slf
--
Gitblit v1.8.0