From d4bf53dd19a45ef09a367babcf7a2ac04ae1d08f Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期二, 17 十月 2023 14:31:31 +0800
Subject: [PATCH] bug修改
---
model/masterOrder.go | 42 ++++++++++++++++++++++++------------------
1 files changed, 24 insertions(+), 18 deletions(-)
diff --git a/model/masterOrder.go b/model/masterOrder.go
index 6231b0b..ac02f01 100644
--- a/model/masterOrder.go
+++ b/model/masterOrder.go
@@ -8,15 +8,17 @@
type (
// MasterOrder 閿�鍞�诲崟
MasterOrder struct {
- Id int `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
- Number string `json:"number" gorm:"column:number;type:varchar(255);comment:閿�鍞�诲崟鍙�"`
- ClientId int `json:"client_id" gorm:"column:client_id;type:int;comment:瀹㈡埛id"`
- Client Client `json:"client" gorm:"foreignKey:ClientId"`
- MemberId int `json:"member_id" gorm:"column:member_id;type:int;comment:璐熻矗浜篿d"`
- StartTime *CustomTime `json:"start_time" gorm:"column:start_time;type:datetime;comment:寮�濮嬫椂闂�"`
- EndTime *CustomTime `json:"end_time" gorm:"column:end_time;type:datetime;comment:缁撴潫鏃堕棿"`
- Money float64 `json:"money" gorm:"column:money;type:decimal(10,2);comment:鎬婚噾棰�"`
- gorm.Model `json:"-"`
+ Id int `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
+ Number string `json:"number" gorm:"column:number;type:varchar(255);comment:閿�鍞�诲崟鍙�"`
+ ClientId int `json:"client_id" gorm:"column:client_id;type:int;comment:瀹㈡埛id"`
+ Client Client `json:"client" gorm:"foreignKey:ClientId"`
+ MemberId int `json:"member_id" gorm:"column:member_id;type:int;comment:璐熻矗浜篿d"`
+ Member User `json:"member" gorm:"foreignKey:MemberId"`
+ StartTime *CustomTime `json:"start_time" gorm:"column:start_time;type:datetime;comment:寮�濮嬫椂闂�"`
+ EndTime *CustomTime `json:"end_time" gorm:"column:end_time;type:datetime;comment:缁撴潫鏃堕棿"`
+ Money float64 `json:"money" gorm:"column:money;type:decimal(10,2);comment:鎬婚噾棰�"`
+ CodeStandID string `json:"codeStandID" gorm:"column:code_stand_id;type:varchar(255);comment:缂栫爜id"`
+ gorm.Model `json:"-"`
}
// MasterOrderSearch 閿�鍞�诲崟鎼滅储鏉′欢
@@ -56,14 +58,13 @@
}
if key == "client_name" {
- db = db.Joins("Client").Where("client.name = ?", v)
+ db = db.Joins("Client").Where("Client.name = ?", v)
}
if key == "member_name" {
- db = db.Joins("User").Where("User.username = ?", v)
+ db = db.Joins("Member").Where("Member.username = ?", v)
}
- case int:
- case float64:
+ case int, float64:
if key == "client_id" || key == "member_id" || key == "money" {
db = db.Where(key+" = ?", v)
}
@@ -107,11 +108,7 @@
db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)
}
- if slf.PageNum > 0 && slf.PageSize > 0 {
- db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)
- }
-
- err := db.Preload("Client").Find(&records).Error
+ err := db.Preload("Member").Preload("Client").Order("id desc").Find(&records).Error
return records, total, err
}
@@ -134,3 +131,12 @@
slf.SearchMap = searchMap
return slf
}
+func (slf *MasterOrderSearch) SetIds(ids []int) *MasterOrderSearch {
+ slf.Orm = slf.Orm.Where("id in (?)", ids)
+ return slf
+}
+
+func (slf *MasterOrderSearch) UpdateByMap(data map[string]interface{}) error {
+ var db = slf.build()
+ return db.Updates(data).Error
+}
--
Gitblit v1.8.0