From 9a7e0a7da01a9f9625ceaca0c61a59c540c6438f Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期五, 18 八月 2023 17:32:10 +0800
Subject: [PATCH] fix
---
model/orderManage.go | 47 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 42 insertions(+), 5 deletions(-)
diff --git a/model/orderManage.go b/model/orderManage.go
index 8dde20b..5037667 100644
--- a/model/orderManage.go
+++ b/model/orderManage.go
@@ -10,6 +10,7 @@
Id int `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
Name string `json:"name" gorm:"column:name;type:varchar(255);comment:鍚堝悓鍚嶇О"`
ClientId int `json:"clientId" gorm:"column:client_id;type:int;comment:瀹㈡埛id"`
+ Client Client `json:"client" gorm:"foreignKey:ClientId"`
Number string `json:"number" gorm:"column:number;type:varchar(255);comment:鍚堝悓缂栧彿"`
ContactId int `json:"contactId" gorm:"column:contact_id;type:int;comment:鑱旂郴浜篿d"`
OrderType int `json:"orderType" gorm:"column:order_type;type:int;comment:宸ュ崟绫诲瀷"`
@@ -17,11 +18,17 @@
SourceSheet int `json:"sourceSheet" gorm:"column:source_sheet;type:int;comment:鏉ユ簮鍗曟嵁"`
ProblemDescription string `json:"problemDescription" gorm:"column:problem_description;type:text;comment:闂鎻忚堪"`
File string `json:"file" gorm:"column:file;type:varchar(255);comment:闄勪欢"`
+ gorm.Model `json:"-"`
}
OrderManageSearch struct {
OrderManage
- Orm *gorm.DB
+
+ Orm *gorm.DB
+ Keyword string
+ OrderBy string
+ PageNum int
+ PageSize int
}
)
@@ -37,6 +44,9 @@
func (slf *OrderManageSearch) build() *gorm.DB {
var db = slf.Orm.Model(&OrderManage{})
+ if slf.Keyword != "" {
+ db = db.Where("name LIKE ?", "%"+slf.Keyword+"%")
+ }
if slf.Id != 0 {
db = db.Where("id = ?", slf.Id)
}
@@ -66,14 +76,41 @@
return record, err
}
-func (slf *OrderManageSearch) FindAll() ([]*OrderManage, error) {
+func (slf *OrderManageSearch) FindAll() ([]*OrderManage, int64, error) {
var db = slf.build()
- var record = make([]*OrderManage, 0)
- err := db.Find(&record).Error
- return record, err
+ var records = make([]*OrderManage, 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("Client").Order("id desc").Find(&records).Error
+ return records, total, err
}
func (slf *OrderManageSearch) SetId(id int) *OrderManageSearch {
slf.Id = id
return slf
}
+
+func (slf *OrderManageSearch) SetKeyword(keyword string) *OrderManageSearch {
+ slf.Keyword = keyword
+ return slf
+}
+
+func (slf *OrderManageSearch) SetPage(page, size int) *OrderManageSearch {
+ slf.PageNum, slf.PageSize = page, size
+ return slf
+}
+
+func (slf *OrderManageSearch) SetOrder(order string) *OrderManageSearch {
+ slf.OrderBy = order
+ return slf
+}
+func (slf *OrderManageSearch) SetIds(ids []int) *OrderManageSearch {
+ slf.Orm = slf.Orm.Where("id in (?)", ids)
+ return slf
+}
--
Gitblit v1.8.0