From 0f15e7b48d064fa6faf99832ca5f4be9bc54e199 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期五, 11 八月 2023 13:41:09 +0800
Subject: [PATCH] fix
---
model/client.go | 92 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 88 insertions(+), 4 deletions(-)
diff --git a/model/client.go b/model/client.go
index c764ea9..7cec5b9 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"
@@ -21,6 +22,7 @@
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"`
+ Member User `json:"member" gorm:"foreignKey:MemberId"`
ServiceMemberId int `json:"service_member_id" gorm:"column:service_member_id;type:int(11);comment:鏈嶅姟璐熻矗浜篒D"`
DetailAddress string `json:"detail_address" gorm:"column:detail_address;type:varchar(255);comment:璇︾粏鍦板潃"`
Remark string `json:"remark" gorm:"column:remark;type:varchar(255);comment:澶囨敞"`
@@ -34,7 +36,12 @@
ClientSearch struct {
Client
- Orm *gorm.DB
+
+ Orm *gorm.DB
+ SearchMap map[string]interface{}
+ OrderBy string
+ PageNum int
+ PageSize int
}
)
@@ -59,6 +66,56 @@
}
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)
+ }
+
+ if key == "client_status" {
+ db = db.Joins("ClientStatus").Where("ClientStatus.name LIKE ?", "%"+v+"%")
+ }
+
+ if key == "client_level" {
+ db = db.Joins("ClientLevel").Where("ClientLevel.name LIKE ?", "%"+v+"%")
+ }
+
+ if key == "member_name" {
+ db = db.Joins("Member").Where("Member.username LIKE ?", "%"+v+"%")
+ }
+
+ case int:
+ if key == "id" || key == "client_type_id" || key == "client_status_id" || key == "member_id" {
+ db = db.Where(key+" = ?", v)
+ }
+ }
+ }
}
return db
@@ -89,6 +146,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
@@ -101,14 +163,36 @@
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("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
+ 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("Member").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) 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
+}
+func (slf *ClientSearch) SetIds(ids []int) *ClientSearch {
+ slf.Orm = slf.Orm.Where("id in (?)", ids)
+ return slf
+}
--
Gitblit v1.8.0