From cdb47d41f39a5c600caa41692c9b5b0732944d6a Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期二, 08 八月 2023 11:38:27 +0800
Subject: [PATCH] fix
---
model/client.go | 79 +++++++++++++++++++++++++++++++--------
1 files changed, 63 insertions(+), 16 deletions(-)
diff --git a/model/client.go b/model/client.go
index e76a52d..11ceaa1 100644
--- a/model/client.go
+++ b/model/client.go
@@ -1,6 +1,7 @@
package model
import (
+ "aps_crm/constvar"
"aps_crm/pkg/mysqlx"
"gorm.io/gorm"
"time"
@@ -35,12 +36,11 @@
ClientSearch struct {
Client
- Orm *gorm.DB
- Keyword string
- OrderBy string
- PageNum int
- PageSize int
-
+ Orm *gorm.DB
+ SearchMap map[string]interface{}
+ OrderBy string
+ PageNum int
+ PageSize int
}
)
@@ -60,14 +60,49 @@
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)
}
if slf.Name != "" {
db.Where("name = ?", slf.Name)
+ }
+
+ if len(slf.SearchMap) > 0 {
+ for key, value := range slf.SearchMap {
+ switch v := value.(type) {
+ case string:
+ if key == "name" || key == "number" || key == "detail_address" {
+ db = db.Where(key+" LIKE ?", "%"+v+"%")
+ }
+
+ if key == "phone" {
+ db = db.Joins("Contacts").Where("Contacts.phone LIKE ?", "%"+v+"%")
+ }
+
+ if key == "contact_name" {
+ db = db.Joins("Contacts").Where("Contacts.name LIKE ?", "%"+v+"%")
+ }
+
+ if key == "next_visit_time" {
+ db = db.Where(key+" = ?", v)
+ }
+
+ // 鏌ヨ瓒呭嚭15澶╂湭鑱旂郴鐨勫鎴�
+ if key == "not_contact" {
+ db = db.Joins("FollowRecord").Where("FollowRecord.follow_time < ?", time.Now().AddDate(0, 0, -15)).Group("clients.id")
+ }
+
+ // 鏌ヨ鍏捣瀹㈡埛
+ if key == "public_sea" {
+ db = db.Where("member_id = ?", constvar.UserTypeSuper)
+ }
+
+ case int:
+ if key == "id" || key == "client_type_id" || key == "client_status_id" || key == "member_id" {
+ db = db.Where(key+" = ?", v)
+ }
+ }
+ }
}
return db
@@ -98,6 +133,11 @@
return slf
}
+func (slf *ClientSearch) SetSearchMap(data map[string]interface{}) *ClientSearch {
+ slf.SearchMap = data
+ return slf
+}
+
func (slf *ClientSearch) SetNumber(number string) *ClientSearch {
slf.Number = number
return slf
@@ -110,21 +150,24 @@
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)
+ 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, err
+ 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 {
@@ -136,3 +179,7 @@
slf.OrderBy = order
return slf
}
+func (slf *ClientSearch) SetIds(ids []int) *ClientSearch {
+ slf.Orm = slf.Orm.Where("id in (?)", ids)
+ return slf
+}
--
Gitblit v1.8.0