From 012da13206f2e4d6a3871b050c71a3b237878424 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期四, 10 八月 2023 16:39:32 +0800
Subject: [PATCH] Merge branch 'master' into fly
---
model/contact.go | 54 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 40 insertions(+), 14 deletions(-)
diff --git a/model/contact.go b/model/contact.go
index abadcea..612fcba 100644
--- a/model/contact.go
+++ b/model/contact.go
@@ -12,6 +12,7 @@
Name string `json:"name" gorm:"column:name;type:varchar(255);comment:鑱旂郴浜哄鍚�"`
Number string `json:"number" gorm:"column:number;type:varchar(255);comment:鑱旂郴浜虹紪鍙�"`
ClientId int `json:"client_id" gorm:"column:client_id;type:int(11);comment:瀹㈡埛ID"`
+ Client Client `json:"-" gorm:"foreignKey:ClientId"`
Position string `json:"position" gorm:"column:position;type:varchar(255);comment:鑱屼綅"`
Phone string `json:"phone" gorm:"column:phone;type:varchar(255);comment:鐢佃瘽"`
MemberId int `json:"member_id" gorm:"column:member_id;type:int(11);comment:璐熻矗浜篒D"`
@@ -27,11 +28,11 @@
ContactSearch struct {
Contact
- Orm *gorm.DB
- Keyword string
- OrderBy string
- PageNum int
- PageSize int
+ Orm *gorm.DB
+ SearchMap map[string]interface{}
+ OrderBy string
+ PageNum int
+ PageSize int
}
ContactDetail struct {
@@ -56,9 +57,6 @@
func (slf *ContactSearch) build() *gorm.DB {
var db = slf.Orm.Model(&Contact{})
- if slf.Keyword != "" {
- db = db.Where("name LIKE ?", "%"+slf.Keyword+"%")
- }
if slf.Id != 0 {
db = db.Where("id = ?", slf.Id)
}
@@ -68,6 +66,35 @@
if slf.ClientId != 0 {
db = db.Where("client_id = ?", slf.ClientId)
+ }
+
+ if len(slf.SearchMap) > 0 {
+ for key, value := range slf.SearchMap {
+ switch v := value.(type) {
+ case string:
+ if key == "name" || key == "position" || key == "phone" || key == "Number" {
+ db = db.Where(key+" LIKE ?", "%"+v+"%")
+ }
+
+ if key == "member_name" {
+ db = db.Joins("Member").Where("Member.username LIKE ?", "%"+v+"%")
+ }
+
+ if key == "client_name" {
+ //db = db.Joins("inner join clients on clients.id = contacts.client_id").Where("clients.name LIKE ?", "%"+v+"%")
+ db = db.Joins("Client").Where("Client.name LIKE ?", "%"+v+"%")
+ }
+
+ if key == "is_first" {
+ if v == "鏄�" {
+ db = db.Where("is_first = ?", true)
+ } else if v == "鍚�" {
+ db = db.Where("is_first = ?", false)
+ }
+ }
+ case int:
+ }
+ }
}
return db
@@ -123,7 +150,6 @@
db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)
}
-
err := db.Preload("FollowRecord").Preload("Client").Preload("Country").Preload("Province").Preload("City").Preload("Region").Find(&records).Error
return records, total, err
}
@@ -155,11 +181,6 @@
return db.Updates(data).Error
}
-func (slf *ContactSearch) SetKeyword(keyword string) *ContactSearch {
- slf.Keyword = keyword
- return slf
-}
-
func (slf *ContactSearch) SetPage(page, size int) *ContactSearch {
slf.PageNum, slf.PageSize = page, size
return slf
@@ -173,3 +194,8 @@
slf.Orm = slf.Orm.Where("id in (?)", ids)
return slf
}
+
+func (slf *ContactSearch) SetSearchMap(data map[string]interface{}) *ContactSearch {
+ slf.SearchMap = data
+ return slf
+}
--
Gitblit v1.8.0