From 7008089d9afcf41b28bb1d27d8923e9dfb031a19 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期一, 14 八月 2023 10:39:40 +0800
Subject: [PATCH] fix
---
model/masterOrder.go | 47 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 34 insertions(+), 13 deletions(-)
diff --git a/model/masterOrder.go b/model/masterOrder.go
index 56550f8..6231b0b 100644
--- a/model/masterOrder.go
+++ b/model/masterOrder.go
@@ -23,11 +23,11 @@
MasterOrderSearch struct {
MasterOrder
- Orm *gorm.DB
- Keyword string
- OrderBy string
- PageNum int
- PageSize int
+ Orm *gorm.DB
+ SearchMap map[string]interface{}
+ OrderBy string
+ PageNum int
+ PageSize int
}
)
@@ -43,11 +43,32 @@
func (slf *MasterOrderSearch) build() *gorm.DB {
var db = slf.Orm.Model(&MasterOrder{})
- 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 == "start_time" || key == "end_time" {
+ db = db.Where(key+" = ?", v)
+ }
+
+ if key == "client_name" {
+ db = db.Joins("Client").Where("client.name = ?", v)
+ }
+
+ if key == "member_name" {
+ db = db.Joins("User").Where("User.username = ?", v)
+ }
+ case int:
+ case float64:
+ if key == "client_id" || key == "member_id" || key == "money" {
+ db = db.Where(key+" = ?", v)
+ }
+ }
+ }
}
return db
@@ -99,11 +120,6 @@
return slf
}
-func (slf *MasterOrderSearch) SetKeyword(keyword string) *MasterOrderSearch {
- slf.Keyword = keyword
- return slf
-}
-
func (slf *MasterOrderSearch) SetPage(page, size int) *MasterOrderSearch {
slf.PageNum, slf.PageSize = page, size
return slf
@@ -113,3 +129,8 @@
slf.OrderBy = order
return slf
}
+
+func (slf *MasterOrderSearch) SetSearchMap(searchMap map[string]interface{}) *MasterOrderSearch {
+ slf.SearchMap = searchMap
+ return slf
+}
--
Gitblit v1.8.0