From 5fa1de02759b9646e8987312736699755990e960 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期五, 13 十月 2023 15:30:22 +0800
Subject: [PATCH] bug修改
---
model/saleChance.go | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/model/saleChance.go b/model/saleChance.go
index bc5ef40..37f9b93 100644
--- a/model/saleChance.go
+++ b/model/saleChance.go
@@ -78,6 +78,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 {
@@ -113,7 +116,7 @@
case int:
case float64:
- if key == "member_id" || key == "budget" || key == "projected_amount" {
+ if key == "member_id" || key == "budget" || key == "projected_amount" || key == "client_id" {
db = db.Where(key+" = ?", v)
}
}
@@ -158,8 +161,15 @@
db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)
}
- err := db.Preload("SaleType").Preload("RegularCustomers").Preload("SalesSources").Preload("Member").Preload("SaleStage").Preload("Possibility").Preload("CollectionProjections").Preload("Client").Preload("Contact.Province").Preload("Contact.City").Order("id desc").Find(&records).Error
+ err := db.Preload("SaleType").Preload("RegularCustomers").Preload("SalesSources").Preload("Member").Preload("SaleStage").Preload("Possibility").Preload("CollectionProjections").Preload("Client").Preload("Province").Preload("City").Order("id desc").Find(&records).Error
return records, total, err
+}
+
+func (slf *SaleChanceSearch) Count() (int64, error) {
+ var db = slf.build()
+ var total int64
+ err := db.Count(&total).Error
+ return total, err
}
func (slf *SaleChanceSearch) SetId(id int) *SaleChanceSearch {
@@ -182,6 +192,11 @@
return slf
}
+func (slf *SaleChanceSearch) SetNumber(number string) *SaleChanceSearch {
+ slf.Number = number
+ return slf
+}
+
func (slf *SaleChanceSearch) SetSearchMap(searchMap map[string]interface{}) *SaleChanceSearch {
slf.SearchMap = searchMap
return slf
--
Gitblit v1.8.0