From 6468db955a239d293e965552733af902e20bdb03 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 10 八月 2023 14:42:09 +0800
Subject: [PATCH] fix
---
model/serviceContract.go | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/model/serviceContract.go b/model/serviceContract.go
index 651ad73..1b6b901 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,6 +14,7 @@
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"`
ContactId int `json:"contactId" gorm:"column:contact_id;type:int;comment:鑱旂郴浜篿d"`
@@ -78,30 +80,31 @@
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 = ?", 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")
+ db = db.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("ServiceContractProduct", clause.LeftJoin).Joins("Product", clause.LeftJoin).Where("Product.name like ?", fmt.Sprintf("%%%s%%", slf.Keyword)) todo
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 slf.Preload {
@@ -111,7 +114,10 @@
Preload("Quotation").
Preload("ServiceContractType").
Preload("ServiceContractStatus").
- Preload("Products")
+ Preload("Products").
+ Preload("Client").
+ Preload("ServiceContractType").
+ Preload("ServiceContractStatus")
}
return db
--
Gitblit v1.8.0