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/subOrder.go | 94 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 68 insertions(+), 26 deletions(-)
diff --git a/model/subOrder.go b/model/subOrder.go
index f383d9d..d798b86 100644
--- a/model/subOrder.go
+++ b/model/subOrder.go
@@ -7,25 +7,26 @@
type (
SubOrder 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"`
- MemberId int `json:"memberId" gorm:"column:member_id;type:int;comment:璐熻矗浜篿d"`
- MasterOrderId int `json:"masterOrderId" gorm:"column:master_order_id;type:int;comment:閿�鍞�诲崟id"`
- Number string `json:"number" gorm:"column:number;type:varchar(255);comment:閿�鍞瓙鍗曞彿"`
- Products []Product `json:"products" gorm:"many2many:subOrder_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"`
+ MemberId int `json:"memberId" gorm:"column:member_id;type:int;comment:璐熻矗浜篿d"`
+ Member User `json:"member" gorm:"foreignKey:MemberId"`
+ MasterOrderId int `json:"masterOrderId" gorm:"column:master_order_id;type:int;comment:閿�鍞�诲崟id"`
+ MasterOrder MasterOrder `json:"masterOrder" gorm:"foreignKey:MasterOrderId"`
+ Number string `json:"number" gorm:"column:number;type:varchar(255);comment:閿�鍞瓙鍗曞彿"`
+ Products []Product `json:"products" gorm:"many2many:subOrder_product;"`
gorm.Model `json:"-"`
}
SubOrderSearch struct {
SubOrder
- Orm *gorm.DB
- Keyword string
- OrderBy string
- PageNum int
- PageSize int
-
+ Orm *gorm.DB
+ SearchMap map[string]interface{}
+ OrderBy string
+ PageNum int
+ PageSize int
}
)
@@ -33,19 +34,47 @@
return "sub_order"
}
-func NewSubOrderSearch() *SubOrderSearch {
+func NewSubOrderSearch(db *gorm.DB) *SubOrderSearch {
+ if db == nil {
+ db = mysqlx.GetDB()
+ }
return &SubOrderSearch{
- Orm: mysqlx.GetDB(),
+ Orm: db,
}
}
func (slf *SubOrderSearch) build() *gorm.DB {
var db = slf.Orm.Model(&SubOrder{})
- 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" {
+ db = db.Where(key+" LIKE ?", "%"+v+"%")
+ }
+
+ if key == "client_name" {
+ db = db.Joins("Client").Where("Client.name LIKE ?", "%"+v+"%")
+ }
+
+ if key == "master_order_number" {
+ db = db.Joins("MasterOrder").Where("MasterOrder.number LIKE ?", "%"+v+"%")
+ }
+
+ if key == "member_name" {
+ db = db.Joins("Member").Where("User.username LIKE ?", "%"+v+"%")
+ }
+ case int:
+ if key == "master_order_id" {
+ db = db.Where("master_order_id = ?", v)
+ }
+ }
+ }
}
return db
@@ -72,19 +101,23 @@
return
}
-func (slf *SubOrderSearch) FindAll() (result []*SubOrder, err error) {
+func (slf *SubOrderSearch) FindAll() ([]*SubOrder, int64, error) {
var db = slf.build()
- err = db.Preload("Products").Preload("Client").Find(&result).Error
- return
+ var records = make([]*SubOrder, 0)
+ 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.Preload("MasterOrder").Preload("Member").Preload("Products").Preload("Client").Order("id desc").Find(&records).Error
+ return records, total, err
}
func (slf *SubOrderSearch) SetId(id int) *SubOrderSearch {
slf.Id = id
- return slf
-}
-
-func (slf *SubOrderSearch) SetKeyword(keyword string) *SubOrderSearch {
- slf.Keyword = keyword
return slf
}
@@ -97,3 +130,12 @@
slf.OrderBy = order
return slf
}
+
+func (slf *SubOrderSearch) SetSearchMap(data map[string]interface{}) *SubOrderSearch {
+ slf.SearchMap = data
+ return slf
+}
+func (slf *SubOrderSearch) SetIds(ids []int) *SubOrderSearch {
+ slf.Orm = slf.Orm.Where("id in (?)", ids)
+ return slf
+}
--
Gitblit v1.8.0