From 899f9d83c3f580ac9d641cd76551d3e0afcf0adf Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期一, 14 八月 2023 11:31:23 +0800
Subject: [PATCH] fix
---
model/subOrder.go | 53 +++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 39 insertions(+), 14 deletions(-)
diff --git a/model/subOrder.go b/model/subOrder.go
index 42bb6eb..e702457 100644
--- a/model/subOrder.go
+++ b/model/subOrder.go
@@ -20,11 +20,11 @@
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
}
)
@@ -40,11 +40,36 @@
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
@@ -91,11 +116,6 @@
return slf
}
-func (slf *SubOrderSearch) SetKeyword(keyword string) *SubOrderSearch {
- slf.Keyword = keyword
- return slf
-}
-
func (slf *SubOrderSearch) SetPage(page, size int) *SubOrderSearch {
slf.PageNum, slf.PageSize = page, size
return slf
@@ -104,4 +124,9 @@
func (slf *SubOrderSearch) SetOrder(order string) *SubOrderSearch {
slf.OrderBy = order
return slf
-}
\ No newline at end of file
+}
+
+func (slf *SubOrderSearch) SetSearchMap(data map[string]interface{}) *SubOrderSearch {
+ slf.SearchMap = data
+ return slf
+}
--
Gitblit v1.8.0