From ff3e203423f296965472d1f09347cda5cfe3a786 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 11 八月 2023 11:37:19 +0800
Subject: [PATCH] update
---
model/serviceContract.go | 186 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 158 insertions(+), 28 deletions(-)
diff --git a/model/serviceContract.go b/model/serviceContract.go
index b2930ad..94acee1 100644
--- a/model/serviceContract.go
+++ b/model/serviceContract.go
@@ -1,36 +1,58 @@
package model
import (
+ "aps_crm/constvar"
"aps_crm/pkg/mysqlx"
+ "fmt"
+ "github.com/shopspring/decimal"
"gorm.io/gorm"
+ "gorm.io/gorm/clause"
"time"
)
type (
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"`
- Number string `json:"number" gorm:"column:number;type:varchar(255);comment:鍚堝悓缂栧彿"`
- MemberId int `json:"memberId" gorm:"column:member_id;type:int;comment:璐熻矗浜篿d"`
- ContactId int `json:"contactId" gorm:"column:contact_id;type:int;comment:鑱旂郴浜篿d"`
- SaleChanceId int `json:"saleChanceId" gorm:"column:sale_chance_id;type:int;comment:閿�鍞満浼歩d"`
- ContractId int `json:"contractId" gorm:"column:contract_id;type:int;comment:鍚堝悓id"`
- QuotationId int `json:"quotationId" gorm:"column:quotation_id;type:int;comment:鎶ヤ环鍗昳d"`
- ServiceContractTypeId int `json:"serviceContractTypeId" gorm:"column:service_contract_type_id;type:int;comment:鍚堝悓绫诲瀷id"`
- SignTime time.Time `json:"signTime" gorm:"column:sign_time;type:datetime;comment:绛剧害鏃堕棿"`
- StartTime time.Time `json:"startTime" gorm:"column:start_time;type:datetime;comment:寮�濮嬫椂闂�"`
- EndTime time.Time `json:"endTime" gorm:"column:end_time;type:datetime;comment:缁撴潫鏃堕棿"`
- ServiceContractStatusId int `json:"serviceContractStatusId" gorm:"column:service_contract_status_id;type:int;comment:鍚堝悓鐘舵�乮d"`
- 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:澶囨敞"`
- Products []Product `json:"products" gorm:"many2many:serviceContract_product;"`
+ 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"`
+ 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"`
+ SalesDetails SalesDetails `json:"salesDetails" gorm:"foreignKey:SalesDetailsId"`
+ QuotationId int `json:"quotationId" gorm:"column:quotation_id;type:int;comment:鎶ヤ环鍗昳d"`
+ 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: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"` // 宸插紑绁ㄩ噾棰�
+ AmountUnInvoiced decimal.Decimal `gorm:"-" json:"amountUnInvoiced"` // 鏈紑绁ㄩ噾棰�
+ Products []*Product `json:"products" gorm:"many2many:service_contract_product;"`
gorm.Model `json:"-"`
}
ServiceContractSearch struct {
ServiceContract
- Orm *gorm.DB
+ Orm *gorm.DB
+ QueryClass constvar.ServiceContractQueryClass
+ KeywordType constvar.ServiceContractKeywordType
+ Keyword interface{}
+ OrderBy string
+ PageNum int
+ PageSize int
+ Preload bool
}
)
@@ -48,6 +70,54 @@
var db = slf.Orm.Model(&ServiceContract{})
if slf.Id != 0 {
db = db.Where("id = ?", slf.Id)
+ }
+ switch slf.QueryClass {
+ case constvar.ServiceContractQueryClassExpireAfter30Day:
+ 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().AddDate(0, 0, 60).Format("2006-01-02"))
+ case constvar.ServiceContractQueryClassExpiredBefore15Day:
+ 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).Format("2006-01-02"))
+ }
+ switch slf.KeywordType {
+ case constvar.ServiceContractKeywordContractNo:
+ db = db.Where("number like ?", fmt.Sprintf("%%%s%%", slf.Keyword))
+ case constvar.ServiceContractKeywordCustomerName:
+ 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.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.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.Joins("left join user on user.id = service_contract.member_id").Where("user.username like ?", fmt.Sprintf("%%%s%%", slf.Keyword))
+ case constvar.ServiceContractKeywordProductName:
+ 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:
+ db = db.Where("amount_receivable = ?", slf.Keyword)
+
+ }
+ if slf.Preload {
+ db = db.
+ Preload("SaleChance").
+ Preload("SalesDetails").
+ Preload("Quotation").
+ Preload("ServiceContractType").
+ Preload("ServiceContractStatus").
+ Preload("Products").
+ Preload("Client").
+ Preload("ServiceContractType").
+ Preload("ServiceContractStatus").
+ Preload("Contact")
}
return db
@@ -68,21 +138,81 @@
return db.Delete(&ServiceContract{}).Error
}
-func (slf *ServiceContractSearch) Find() (*ServiceContract, error) {
- var db = slf.build()
- var record = &ServiceContract{}
- err := db.First(record).Error
- return record, err
-}
-
-func (slf *ServiceContractSearch) FindAll() ([]*ServiceContract, error) {
+func (slf *ServiceContractSearch) Find() ([]*ServiceContract, int64, error) {
var db = slf.build()
var records = make([]*ServiceContract, 0)
- err := db.Preload("Products").Find(&records).Error
- return records, err
+ var total int64
+ if err := db.Count(&total).Error; err != nil {
+ return records, total, err
+ }
+ if slf.PageNum > 0 && slf.PageSize > 0 {
+ db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)
+ }
+
+ err := db.Find(&records).Error
+ return records, total, err
}
func (slf *ServiceContractSearch) SetId(id int) *ServiceContractSearch {
slf.Id = id
return slf
}
+
+func (slf *ServiceContractSearch) SetKeywordType(keyword constvar.ServiceContractKeywordType) *ServiceContractSearch {
+ slf.KeywordType = keyword
+ return slf
+}
+
+func (slf *ServiceContractSearch) SetQueryClass(queryClass constvar.ServiceContractQueryClass) *ServiceContractSearch {
+ slf.QueryClass = queryClass
+ return slf
+}
+
+func (slf *ServiceContractSearch) SetKeyword(keyword string) *ServiceContractSearch {
+ slf.Keyword = keyword
+ return slf
+}
+
+func (slf *ServiceContractSearch) SetPage(page, size int) *ServiceContractSearch {
+ slf.PageNum, slf.PageSize = page, size
+ return slf
+}
+
+func (slf *ServiceContractSearch) SetOrder(order string) *ServiceContractSearch {
+ slf.OrderBy = order
+ return slf
+}
+func (slf *ServiceContractSearch) SetIds(ids []int) *ServiceContractSearch {
+ slf.Orm = slf.Orm.Where("id in (?)", ids)
+ return slf
+}
+
+func (slf *ServiceContractSearch) SetPreload(preload bool) *ServiceContractSearch {
+ slf.Preload = preload
+ return slf
+}
+
+func (slf *ServiceContractSearch) UpdateByMap(upMap map[string]interface{}) error {
+ var (
+ db = slf.build()
+ )
+
+ if err := db.Updates(upMap).Error; err != nil {
+ return fmt.Errorf("update by map err: %v, upMap: %+v", err, upMap)
+ }
+
+ return nil
+}
+
+func (slf *ServiceContractSearch) First() (*ServiceContract, error) {
+ var (
+ record = new(ServiceContract)
+ db = slf.build()
+ )
+
+ if err := db.First(record).Error; err != nil {
+ return record, err
+ }
+
+ return record, nil
+}
--
Gitblit v1.8.0