From 05582688724c78bc70a7bc860193c67677f6c8cf Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期六, 28 十月 2023 10:46:37 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/crm
---
model/saleChance.go | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/model/saleChance.go b/model/saleChance.go
index 9836705..5f0f37c 100644
--- a/model/saleChance.go
+++ b/model/saleChance.go
@@ -2,6 +2,7 @@
import (
"aps_crm/pkg/mysqlx"
+ "fmt"
"gorm.io/gorm"
)
@@ -48,6 +49,7 @@
CollectionProjections []CollectionProjection `json:"collection_projections" gorm:"foreignKey:SaleChanceId"`
SalesSources SalesSources `json:"sales_sources"`
CodeStandID string `json:"codeStandID" gorm:"column:code_stand_id;type:varchar(255);comment:缂栫爜id"`
+ Products []*Product `json:"products" gorm:"many2many:SaleChanceProduct;"`
Address
gorm.Model `json:"-"`
}
@@ -134,7 +136,7 @@
func (slf *SaleChanceSearch) Update(record *SaleChance) (err error) {
var db = slf.build()
- err = db.Updates(record).Error
+ err = db.Preload("Products").Updates(record).Error
return
}
@@ -146,7 +148,7 @@
func (slf *SaleChanceSearch) Find() (record SaleChance, err error) {
var db = slf.build()
- err = db.First(&record).Error
+ err = db.Preload("Products").First(&record).Error
return
}
@@ -161,7 +163,7 @@
db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)
}
- err := db.Preload("SaleType").Preload("RegularCustomers").Preload("SalesSources").
+ err := db.Preload("SaleType").Preload("RegularCustomers").Preload("SalesSources").Preload("Products").
Preload("Member").Preload("SaleStage").Preload("Possibility").
Preload("CollectionProjections").Preload("Client").
Preload("Province").Preload("City").Preload("Contact").Preload("Status").Order("id desc").Find(&records).Error
@@ -212,3 +214,20 @@
var db = slf.build()
return db.Updates(data).Error
}
+
+func (slf *SaleChanceSearch) 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
+}
--
Gitblit v1.8.0