From c5a0eb549cba2cd358a2d0496c44f3a289f15d9c Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期一, 28 八月 2023 14:22:06 +0800
Subject: [PATCH] fix
---
model/quotation.go | 99 +++++++++++++++++++++++++++++++++----------------
1 files changed, 66 insertions(+), 33 deletions(-)
diff --git a/model/quotation.go b/model/quotation.go
index 2999797..091c34b 100644
--- a/model/quotation.go
+++ b/model/quotation.go
@@ -3,25 +3,27 @@
import (
"aps_crm/pkg/mysqlx"
"gorm.io/gorm"
- "time"
)
type (
// Quotation 鎶ヤ环鍗�
Quotation struct {
- Id int `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
- ClientId int `json:"client_id" gorm:"column:client_id;type:int;comment:瀹㈡埛id"`
- Number string `json:"number" gorm:"column:number;type:varchar(255);comment:鎶ヤ环鍗曞彿"`
- QuotationStatusId int `json:"quotation_status_id" gorm:"column:quotation_status_id;type:int;comment:鎶ヤ环鍗曠姸鎬乮d"`
- ValidityDate time.Time `json:"validity_date" gorm:"column:validity_date;type:datetime;comment:鏈夋晥鏈�"`
- ContactId int `json:"contact_id" gorm:"column:contact_id;type:int;comment:鑱旂郴浜篿d"`
- MemberId int `json:"member_id" gorm:"column:member_id;type:int;comment:璐熻矗浜篿d"`
- SaleChanceId int `json:"sale_chance_id" gorm:"column:sale_chance_id;type:int;comment:鍟嗘満id"`
- Conditions string `json:"conditions" gorm:"column:conditions;type:text;comment:鎶ヤ环鏉′欢"`
- File string `json:"file" gorm:"column:file;type:varchar(255);comment:闄勪欢"`
- Client Client `json:"client" gorm:"foreignKey:ClientId"`
- Contact Contact `json:"contact" gorm:"foreignKey:ContactId"`
- SaleChance SaleChance `json:"sale_chance" gorm:"foreignKey:SaleChanceId"`
+ Id int `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
+ ClientId int `json:"client_id" gorm:"column:client_id;type:int;comment:瀹㈡埛id"`
+ Number string `json:"number" gorm:"column:number;type:varchar(255);comment:鎶ヤ环鍗曞彿"`
+ QuotationStatusId int `json:"quotation_status_id" gorm:"column:quotation_status_id;type:int;comment:鎶ヤ环鍗曠姸鎬乮d"`
+ QuotationStatus QuotationStatus `json:"quotation_status" gorm:"foreignKey:QuotationStatusId"`
+ ValidityDate *CustomTime `json:"validity_date" gorm:"column:validity_date;type:datetime;comment:鏈夋晥鏈�"`
+ ContactId int `json:"contact_id" gorm:"column:contact_id;type:int;comment:鑱旂郴浜篿d"`
+ MemberId int `json:"member_id" gorm:"column:member_id;type:int;comment:璐熻矗浜篿d"`
+ Member User `json:"member" gorm:"foreignKey:MemberId"`
+ SaleChanceId int `json:"sale_chance_id" gorm:"column:sale_chance_id;type:int;comment:閿�鍞満浼歩d"`
+ Conditions string `json:"conditions" gorm:"column:conditions;type:text;comment:鎶ヤ环鏉′欢"`
+ File string `json:"file" gorm:"column:file;type:varchar(255);comment:闄勪欢"`
+ Client Client `json:"client" gorm:"foreignKey:ClientId"`
+ Contact Contact `json:"contact" gorm:"foreignKey:ContactId"`
+ SaleChance SaleChance `json:"sale_chance" gorm:"foreignKey:SaleChanceId"`
+ Products []Product `json:"products" gorm:"many2many:quotation_product"`
gorm.Model `json:"-"`
}
@@ -29,12 +31,11 @@
QuotationSearch struct {
Quotation
- Orm *gorm.DB
- Keyword string
- OrderBy string
- PageNum int
- PageSize int
-
+ Orm *gorm.DB
+ SearchMap map[string]interface{}
+ OrderBy string
+ PageNum int
+ PageSize int
}
)
@@ -42,19 +43,47 @@
return "quotation"
}
-func NewQuotationSearch() *QuotationSearch {
+func NewQuotationSearch(db *gorm.DB) *QuotationSearch {
+ if db == nil {
+ db = mysqlx.GetDB()
+ }
return &QuotationSearch{
- Orm: mysqlx.GetDB(),
+ Orm: db,
}
}
func (slf *QuotationSearch) build() *gorm.DB {
var db = slf.Orm.Model(&Quotation{})
- if slf.Keyword != "" {
- db = db.Where("name LIKE ?", "%"+slf.Keyword+"%")
- }
if slf.Id != 0 {
db = db.Where("id = ?", slf.Id)
+ }
+
+ if len(slf.SearchMap) > 0 {
+ for key, value := range slf.SearchMap {
+ switch v := value.(type) {
+ case string:
+ if key == "number" || key == "validity_date" {
+ db = db.Where(key+" LIKE ?", "%"+v+"%")
+ }
+
+ if key == "client_name" {
+ db = db.Joins("Client").Where("Client.name LIKE ?", "%"+v+"%")
+ }
+
+ if key == "contact_name" {
+ db = db.Joins("Contact").Where("Contact.name LIKE ?", "%"+v+"%")
+ }
+
+ if key == "member_name" {
+ db = db.Joins("Member").Where("Member.username LIKE ?", "%"+v+"%")
+ }
+
+ case int:
+ if key == "client_id" || key == "sale_chance_id" {
+ db = db.Where(key+" = ?", v)
+ }
+ }
+ }
}
return db
@@ -78,7 +107,7 @@
func (slf *QuotationSearch) Find() (*Quotation, error) {
var db = slf.build()
var record Quotation
- err := db.Preload("Client").Preload("Contact").Preload("SaleChance").First(&record).Error
+ err := db.Preload("Products").Preload("Client").Preload("Contact").Preload("SaleChance").First(&record).Error
return &record, err
}
@@ -93,7 +122,7 @@
db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)
}
- err := db.Find(&records).Error
+ err := db.Preload("Products").Preload("Member").Preload("QuotationStatus").Preload("Client").Preload("Contact").Order("id desc").Find(&records).Error
return records, total, err
}
@@ -107,11 +136,6 @@
return db.Updates(data).Error
}
-func (slf *QuotationSearch) SetKeyword(keyword string) *QuotationSearch {
- slf.Keyword = keyword
- return slf
-}
-
func (slf *QuotationSearch) SetPage(page, size int) *QuotationSearch {
slf.PageNum, slf.PageSize = page, size
return slf
@@ -120,4 +144,13 @@
func (slf *QuotationSearch) SetOrder(order string) *QuotationSearch {
slf.OrderBy = order
return slf
-}
\ No newline at end of file
+}
+
+func (slf *QuotationSearch) SetSearchMap(searchMap map[string]interface{}) *QuotationSearch {
+ slf.SearchMap = searchMap
+ return slf
+}
+func (slf *QuotationSearch) SetIds(ids []int) *QuotationSearch {
+ slf.Orm = slf.Orm.Where("id in (?)", ids)
+ return slf
+}
--
Gitblit v1.8.0