From b4400a06b5f801bc7a85320680d0b6c45c547ff0 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期五, 28 七月 2023 10:21:33 +0800
Subject: [PATCH] fix
---
model/client.go | 53 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 46 insertions(+), 7 deletions(-)
diff --git a/model/client.go b/model/client.go
index 931337c..8c694d8 100644
--- a/model/client.go
+++ b/model/client.go
@@ -12,9 +12,13 @@
Name string `json:"name" gorm:"column:name;unique;type:varchar(255);comment:瀹㈡埛鍚嶇О"`
Number string `json:"number" gorm:"column:number;type:varchar(255);comment:瀹㈡埛缂栧彿"`
ClientStatusId int `json:"client_status_id" gorm:"column:client_status_id;type:int(11);comment:瀹㈡埛鐘舵�両D"`
+ ClientStatus ClientStatus `json:"client_status" gorm:"foreignKey:ClientStatusId"`
ClientTypeId int `json:"client_type_id" gorm:"column:client_type_id;type:int(11);comment:瀹㈡埛绫诲瀷ID"`
+ ClientType ClientType `json:"client_type" gorm:"foreignKey:ClientTypeId"`
ClientOriginId int `json:"client_origin_id" gorm:"column:client_origin_id;type:int(11);comment:瀹㈡埛鏉ユ簮ID"`
+ ClientOrigin ClientOrigin `json:"client_origin" gorm:"foreignKey:ClientOriginId"`
ClientLevelId int `json:"client_level_id" gorm:"column:client_level_id;type:int(11);comment:瀹㈡埛绛夌骇ID"`
+ ClientLevel ClientLevel `json:"client_level" gorm:"foreignKey:ClientLevelId"`
Contacts []Contact `json:"contacts" gorm:"foreignKey:ClientId"`
MemberId int `json:"member_id" gorm:"column:member_id;type:int(11);comment:閿�鍞礋璐ｄ汉ID"`
ServiceMemberId int `json:"service_member_id" gorm:"column:service_member_id;type:int(11);comment:鏈嶅姟璐熻矗浜篒D"`
@@ -30,7 +34,12 @@
ClientSearch struct {
Client
- Orm *gorm.DB
+
+ Orm *gorm.DB
+ Keyword string
+ OrderBy string
+ PageNum int
+ PageSize int
}
)
@@ -38,14 +47,21 @@
return "clients"
}
-func NewClientSearch() *ClientSearch {
+func NewClientSearch(db *gorm.DB) *ClientSearch {
+ if db == nil {
+ db = mysqlx.GetDB()
+ }
+
return &ClientSearch{
- Orm: mysqlx.GetDB(),
+ Orm: db,
}
}
func (slf *ClientSearch) build() *gorm.DB {
var db = slf.Orm.Model(&Client{})
+ if slf.Keyword != "" {
+ db = db.Where("name LIKE ?", "%"+slf.Keyword+"%")
+ }
if slf.Id != 0 {
db.Where("id = ?", slf.Id)
}
@@ -63,7 +79,7 @@
func (slf *ClientSearch) Update(record *Client) error {
var db = slf.build()
- return db.Save(record).Error
+ return db.Updates(record).Error
}
func (slf *ClientSearch) Delete() error {
@@ -93,14 +109,37 @@
return record, err
}
-func (slf *ClientSearch) Find() ([]*Client, error) {
+func (slf *ClientSearch) Find() ([]*Client, int64, error) {
var db = slf.build()
var records = make([]*Client, 0)
- err := db.Preload("FollowRecord").Preload("EnterpriseNature").Preload("RegisteredCapital").Preload("Industry").Preload("EnterpriseScale").Preload("Contacts").Preload("Country").Preload("Province").Preload("City").Preload("Region").Find(&records).Error
- return records, err
+ 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("ClientStatus").Preload("ClientType").Preload("ClientOrigin").Preload("ClientLevel").Preload("FollowRecord").Preload("EnterpriseNature").Preload("RegisteredCapital").Preload("Industry").Preload("EnterpriseScale").Preload("Contacts").Preload("Country").Preload("Province").Preload("City").Preload("Region").Find(&records).Error
+ return records, total, err
}
func (slf *ClientSearch) UpdateByMap(data map[string]interface{}) error {
var db = slf.build()
return db.Updates(data).Error
}
+
+func (slf *ClientSearch) SetKeyword(keyword string) *ClientSearch {
+ slf.Keyword = keyword
+ return slf
+}
+
+func (slf *ClientSearch) SetPage(page, size int) *ClientSearch {
+ slf.PageNum, slf.PageSize = page, size
+ return slf
+}
+
+func (slf *ClientSearch) SetOrder(order string) *ClientSearch {
+ slf.OrderBy = order
+ return slf
+}
--
Gitblit v1.8.0