From 530fed8ec225453572d57b15c200ab062c335457 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 01 十一月 2023 19:20:21 +0800
Subject: [PATCH] 公海member_id使用0
---
model/serviceContract.go | 182 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 157 insertions(+), 25 deletions(-)
diff --git a/model/serviceContract.go b/model/serviceContract.go
index 22dac27..61d8e5f 100644
--- a/model/serviceContract.go
+++ b/model/serviceContract.go
@@ -6,6 +6,7 @@
"fmt"
"github.com/shopspring/decimal"
"gorm.io/gorm"
+ "gorm.io/gorm/clause"
"time"
)
@@ -13,9 +14,12 @@
ServiceContract struct {
Id int `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
ClientId int `json:"clientId" gorm:"column:client_id;type:int;comment:瀹㈡埛id"`
+ 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"`
SaleChance SaleChance `json:"SaleChance" gorm:"foreignKey:SaleChanceId"`
SalesDetailsId int `json:"salesDetailsId" gorm:"column:sales_details_id;type:int;comment:鍚堝悓璁㈠崟id"`
@@ -24,24 +28,26 @@
Quotation Quotation `json:"quotation" gorm:"foreignKey:QuotationId"`
ServiceContractTypeId int `json:"serviceContractTypeId" gorm:"column:service_contract_type_id;type:int;comment:鍚堝悓绫诲瀷id"`
ServiceContractType ServiceContractType `json:"serviceContractType" gorm:"foreignKey:ServiceContractTypeId"`
- SignTime string `json:"signTime" gorm:"column:sign_time;type:datetime;comment:绛剧害鏃堕棿"`
- StartTime string `json:"startTime" gorm:"column:start_time;type:datetime;comment:寮�濮嬫椂闂�"`
- EndTime string `json:"endTime" gorm:"column:end_time;type:datetime;comment:缁撴潫鏃堕棿"`
+ SignTime string `json:"signTime" gorm:"column:sign_time;type:varchar(255);comment:绛剧害鏃堕棿"`
+ StartTime string `json:"startTime" gorm:"column:start_time;type:varchar(255);comment:寮�濮嬫椂闂�"`
+ EndTime string `json:"endTime" gorm:"column:end_time;type:varchar(255);comment:缁撴潫鏃堕棿"`
ServiceContractStatusId int `json:"serviceContractStatusId" gorm:"column:service_contract_status_id;type:int;comment:鍚堝悓鐘舵�乮d"`
ServiceContractStatus ServiceContractStatus `json:"serviceContractStatus" gorm:"foreignKey:ServiceContractStatusId"`
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:"amount_receivable" json:"amountReceivable"` // 搴旀敹閲戦
- AmountReceived decimal.Decimal `gorm:"amount_received" json:"amountReceived"` // 宸叉敹閲戦
- AmountInvoiced decimal.Decimal `gorm:"amount_invoiced" json:"amountInvoiced"` // 宸插紑绁ㄩ噾棰�
- Products []Product `json:"products" gorm:"many2many:service_contract_product;"`
- gorm.Model `json:"-"`
+ 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;"`
+ CodeStandID string `json:"codeStandID" gorm:"column:code_stand_id;type:varchar(255);comment:缂栫爜id"`
+ CrmModel
}
ServiceContractSearch struct {
ServiceContract
-
Orm *gorm.DB
QueryClass constvar.ServiceContractQueryClass
KeywordType constvar.ServiceContractKeywordType
@@ -50,10 +56,11 @@
PageNum int
PageSize int
Preload bool
+ MemberIds []int
}
)
-func (ServiceContract) TableName() string {
+func (slf *ServiceContract) TableName() string {
return "service_contract"
}
@@ -70,49 +77,77 @@
}
switch slf.QueryClass {
case constvar.ServiceContractQueryClassExpireAfter30Day:
- db = db.Where("end_time > ?", time.Now(), time.Now().AddDate(0, 0, 30))
+ db = db.Where("end_time > ?", time.Now().AddDate(0, 0, 30).Format("2006-01-02"))
case constvar.ServiceContractQueryClassExpireAfter60Day:
- db = db.Where("end_time > ?", time.Now(), time.Now().AddDate(0, 0, 60))
+ db = db.Where("end_time > ?", time.Now().AddDate(0, 0, 60).Format("2006-01-02"))
case constvar.ServiceContractQueryClassExpiredBefore15Day:
- db = db.Where("end_time < ?", time.Now().AddDate(0, 0, -15))
+ db = db.Where("end_time < ?", time.Now().AddDate(0, 0, -15).Format("2006-01-02"))
case constvar.ServiceContractQueryClassExpiredBefore60Day:
- db = db.Where("end_time < ?", time.Now().AddDate(0, 0, -60))
-
+ db = db.Where("end_time < ?", time.Now().AddDate(0, 0, -60).Format("2006-01-02"))
}
switch slf.KeywordType {
case constvar.ServiceContractKeywordContractNo:
- db = db.Where("number = ?", slf.Keyword)
+ db = db.Where("number like ?", fmt.Sprintf("%%%s%%", slf.Keyword))
case constvar.ServiceContractKeywordCustomerName:
- db = db.Where("client_id = ?", slf.Keyword)
+ db = db.Joins("Client", clause.LeftJoin).Where("Client.name like ?", fmt.Sprintf("%%%s%%", slf.Keyword))
case constvar.ServiceContractKeywordContractDate:
db = db.Where("sign_time = ?", slf.Keyword)
case constvar.ServiceContractKeywordContractType:
- db = db.Where("service_contract_type_id = ?", slf.Keyword)
+ db = db.Joins("left join service_contract_type on service_contract_type.id = service_contract.service_contract_type_id")
+ db = db.Where("service_contract_type.name like ?", fmt.Sprintf("%%%s%%", slf.Keyword))
case constvar.ServiceContractKeywordContractStatus:
- db = db.Where("service_contract_status_id = ?", slf.Keyword)
+ db = db.Joins("left join service_contract_status on service_contract_status.id = service_contract.service_contract_status_id")
+ db = db.Where("service_contract_status.name like ?", fmt.Sprintf("%%%s%%", slf.Keyword))
case constvar.ServiceContractKeywordPrincipal:
- db = db.Where("member_id = ?", slf.Keyword)
+ db = db.Joins("left join user on user.id = service_contract.member_id").Where("user.username like ?", fmt.Sprintf("%%%s%%", slf.Keyword))
case constvar.ServiceContractKeywordProductName:
- subQuery := db.Table("service_contract_id").Select("product_id").Where("product_id = ?", slf.Keyword)
- db = db.Where("id = ?", subQuery)
+ db = db.Joins("left join service_contract_product scp on scp.service_contract_id = service_contract.id left join products on scp.product_id = products.id").Where("products.name like ?", fmt.Sprintf("%%%s%%", slf.Keyword))
case constvar.ServiceContractKeywordServiceBeginDate:
db = db.Where("start_time = ?", slf.Keyword)
case constvar.ServiceContractKeywordServiceEndDate:
db = db.Where("end_time = ?", slf.Keyword)
case constvar.ServiceContractKeywordServiceTotalPrice:
- //todo
+ db = db.Where("amount_receivable = ?", slf.Keyword)
}
+
+ if len(slf.MemberIds) > 0 {
+ db = db.Where("service_contract.member_id in ?", slf.MemberIds)
+ }
+
if slf.Preload {
db = db.
+ Preload("Client").
+ Preload("Member").
+ Preload("Contact").
Preload("SaleChance").
Preload("SalesDetails").
Preload("Quotation").
Preload("ServiceContractType").
Preload("ServiceContractStatus").
- Preload("Products")
+ Preload("Products").
+ Preload("Client").
+ Preload("ServiceContractType").
+ Preload("ServiceContractStatus").
+ 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
}
@@ -131,6 +166,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)
@@ -142,8 +183,37 @@
db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)
}
- err := db.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 {
@@ -180,6 +250,31 @@
return slf
}
+func (slf *ServiceContractSearch) SetMemberIds(memberIds []int) *ServiceContractSearch {
+ slf.MemberIds = memberIds
+ 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
@@ -209,3 +304,40 @@
return record, nil
}
+
+func (slf *ServiceContractSearch) AmountReceivableAdd(tx *gorm.DB, id int, amount decimal.Decimal) error {
+ slf.Orm = tx
+ record, err := slf.SetId(id).First()
+ if err != nil {
+ return err
+ }
+ amount = record.AmountReceivable.Add(amount)
+ return slf.UpdateByMap(map[string]interface{}{"amount_receivable": amount})
+}
+func (slf *ServiceContractSearch) AmountReceivedAdd(tx *gorm.DB, id int, amount decimal.Decimal) error {
+ slf.Orm = tx
+ record, err := slf.SetId(id).First()
+ if err != nil {
+ return err
+ }
+ amount = record.AmountReceived.Add(amount)
+ return slf.UpdateByMap(map[string]interface{}{"amount_received": amount})
+}
+func (slf *ServiceContractSearch) AmountInvoicedAdd(tx *gorm.DB, id int, amount decimal.Decimal) error {
+ slf.Orm = tx
+ record, err := slf.SetId(id).First()
+ if err != nil {
+ return err
+ }
+ amount = record.AmountInvoiced.Add(amount)
+ return slf.UpdateByMap(map[string]interface{}{"amount_invoiced": amount})
+}
+func (slf *ServiceContractSearch) AmountNotInvoicedAdd(tx *gorm.DB, id int, amount decimal.Decimal) error {
+ slf.Orm = tx
+ record, err := slf.SetId(id).First()
+ if err != nil {
+ return err
+ }
+ amount = record.AmountUnInvoiced.Add(amount)
+ return slf.UpdateByMap(map[string]interface{}{"amount_not_invoiced": amount})
+}
--
Gitblit v1.8.0