From 530fed8ec225453572d57b15c200ab062c335457 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 01 十一月 2023 19:20:21 +0800
Subject: [PATCH] 公海member_id使用0
---
model/salesLeads.go | 50 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 44 insertions(+), 6 deletions(-)
diff --git a/model/salesLeads.go b/model/salesLeads.go
index b854d46..f783ad2 100644
--- a/model/salesLeads.go
+++ b/model/salesLeads.go
@@ -3,25 +3,29 @@
import (
"aps_crm/constvar"
"aps_crm/pkg/mysqlx"
+ "fmt"
"gorm.io/gorm"
)
type (
SalesLeads struct {
Id int `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
- Name string `json:"name" gorm:"column:name;unique;type:varchar(255);comment:鍏徃鍚嶇О"`
+ Name string `json:"name" gorm:"column:name;uniqueIndex:name_isDeleted_idx;;type:varchar(255);comment:瀹㈡埛鍚嶇О"`
+ IsDeleted bool `json:"-" gorm:"column:is_deleted;uniqueIndex:name_isDeleted_idx;type:tinyint(1);comment:鏄惁鍒犻櫎"`
Number string `json:"number" gorm:"column:number;type:varchar(255);comment:閿�鍞嚎绱㈢紪鍙�"`
ContactName string `json:"contact_name" gorm:"column:contact_name;type:varchar(255);comment:鑱旂郴浜哄鍚�"`
ContactPhone string `json:"contact_phone" gorm:"column:contact_phone;type:varchar(255);comment:鑱旂郴浜虹數璇�"`
ContactPosition string `json:"contact_position" gorm:"column:contact_position;type:varchar(255);comment:鑱旂郴浜鸿亴浣�"`
SalesSourcesId int `json:"sales_sources_id" gorm:"column:sales_sources_id;type:int(11);comment:鍟嗘満鏉ユ簮ID"`
- SalesSources SalesSources `json:"-" gorm:"foreignKey:SalesSourcesId"`
+ SalesSources SalesSources `json:"sales_sources" gorm:"foreignKey:SalesSourcesId"`
MemberId int `json:"member_id" gorm:"column:member_id;type:int(11);comment:閿�鍞礋璐ｄ汉ID"`
- Member User `json:"-" gorm:"foreignKey:MemberId"`
+ Member User `json:"member" gorm:"foreignKey:MemberId"`
SalesStatus constvar.SalesStatus `json:"sales_status" gorm:"column:sales_status;type:int(11);comment:閿�鍞姸鎬�"`
Desc string `json:"desc" gorm:"column:desc;type:varchar(255);comment:澶囨敞"`
Reason string `json:"reason" gorm:"column:reason;type:text;comment:澶辫触鍘熷洜"`
FollowRecord []FollowRecord `gorm:"foreignKey:SalesLeadsId"`
+ DetailAddress string `json:"detail_address" gorm:"column:detail_address;type:varchar(255);comment:璇︾粏鍦板潃"`
+ CodeStandID string `json:"codeStandID" gorm:"column:code_stand_id;type:varchar(255);comment:缂栫爜id"`
Address
gorm.Model `json:"-"`
}
@@ -59,6 +63,9 @@
if slf.Name != "" {
db = db.Where("name = ?", slf.Name)
}
+ if slf.Number != "" {
+ db = db.Where("number = ?", slf.Number)
+ }
if len(slf.SearchMap) > 0 {
for key, value := range slf.SearchMap {
@@ -85,8 +92,9 @@
}
case int:
- if key == "member_id" {
- db = db.Where("member_id = ?", v)
+ case []int:
+ if key == "member_ids" {
+ db = db.Where("sales_leads.member_id in ?", v)
}
}
}
@@ -107,6 +115,7 @@
func (slf *SalesLeadsSearch) Delete() error {
var db = slf.build()
+ db.Update("is_deleted", 1)
return db.Delete(&SalesLeads{}).Error
}
@@ -133,8 +142,32 @@
db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)
}
- err := db.Preload("FollowRecord").Find(&records).Error
+ err := db.Preload("SalesSources").Preload("Member").Preload("Province").Preload("City").Preload("FollowRecord").Order("id desc").Find(&records).Error
return records, total, err
+}
+
+func (slf *SalesLeadsSearch) Count() (int64, error) {
+ var db = slf.build()
+ var total int64
+ err := db.Count(&total).Error
+ return total, err
+}
+
+func (slf *SalesLeadsSearch) MaxAutoIncr() (int, error) {
+ type Result struct {
+ Max int
+ }
+
+ var (
+ result Result
+ db = slf.build()
+ )
+
+ err := db.Select("MAX(id) as max").Scan(&result).Error
+ if err != nil {
+ return result.Max, fmt.Errorf("max err: %v", err)
+ }
+ return result.Max, nil
}
func (slf *SalesLeadsSearch) SetId(id int) *SalesLeadsSearch {
@@ -172,6 +205,11 @@
return slf
}
+func (slf *SalesLeadsSearch) SetNumber(number string) *SalesLeadsSearch {
+ slf.Number = number
+ return slf
+}
+
func (slf *SalesLeadsSearch) SetSearchMap(data map[string]interface{}) *SalesLeadsSearch {
slf.SearchMap = data
return slf
--
Gitblit v1.8.0