From 0ce02d3f2ccd767c50efe5f2e0211ec24f1583b3 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期二, 15 八月 2023 10:26:37 +0800
Subject: [PATCH] fix
---
model/salesLeads.go | 2 +-
model/client.go | 2 +-
model/saleChance.go | 6 ++++--
model/quotation.go | 2 +-
docs/swagger.yaml | 8 ++++++--
docs/docs.go | 8 +++++++-
docs/swagger.json | 8 +++++++-
7 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index 32afd1e..9e8a1ad 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -11736,6 +11736,9 @@
"region_id": {
"type": "integer"
},
+ "regular_customers": {
+ "$ref": "#/definitions/model.RegularCustomers"
+ },
"regular_customers_id": {
"type": "integer"
},
@@ -11748,10 +11751,13 @@
"sale_stage_id": {
"type": "integer"
},
+ "sale_type": {
+ "$ref": "#/definitions/model.SaleType"
+ },
"sale_type_id": {
"type": "integer"
},
- "salesSources": {
+ "sales_sources": {
"$ref": "#/definitions/model.SalesSources"
},
"sales_sources_id": {
diff --git a/docs/swagger.json b/docs/swagger.json
index aaa309a..85e27d3 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -11724,6 +11724,9 @@
"region_id": {
"type": "integer"
},
+ "regular_customers": {
+ "$ref": "#/definitions/model.RegularCustomers"
+ },
"regular_customers_id": {
"type": "integer"
},
@@ -11736,10 +11739,13 @@
"sale_stage_id": {
"type": "integer"
},
+ "sale_type": {
+ "$ref": "#/definitions/model.SaleType"
+ },
"sale_type_id": {
"type": "integer"
},
- "salesSources": {
+ "sales_sources": {
"$ref": "#/definitions/model.SalesSources"
},
"sales_sources_id": {
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index cff0fad..db44e48 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -1226,6 +1226,8 @@
$ref: '#/definitions/model.Region'
region_id:
type: integer
+ regular_customers:
+ $ref: '#/definitions/model.RegularCustomers'
regular_customers_id:
type: integer
remark:
@@ -1234,12 +1236,14 @@
$ref: '#/definitions/model.SaleStage'
sale_stage_id:
type: integer
+ sale_type:
+ $ref: '#/definitions/model.SaleType'
sale_type_id:
type: integer
+ sales_sources:
+ $ref: '#/definitions/model.SalesSources'
sales_sources_id:
type: integer
- salesSources:
- $ref: '#/definitions/model.SalesSources'
solutions:
type: string
status_id:
diff --git a/model/client.go b/model/client.go
index f7470f6..f68f542 100644
--- a/model/client.go
+++ b/model/client.go
@@ -174,7 +174,7 @@
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
+ 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").Order("id desc").Find(&records).Error
return records, total, err
}
diff --git a/model/quotation.go b/model/quotation.go
index 61061ae..77a4e5c 100644
--- a/model/quotation.go
+++ b/model/quotation.go
@@ -117,7 +117,7 @@
db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)
}
- err := db.Find(&records).Error
+ err := db.Preload("Client").Preload("Contact").Find(&records).Error
return records, total, err
}
diff --git a/model/saleChance.go b/model/saleChance.go
index 1f54c8d..175ac2a 100644
--- a/model/saleChance.go
+++ b/model/saleChance.go
@@ -14,11 +14,13 @@
ClientId int `json:"client_id" gorm:"column:client_id;type:int(11);comment:瀹㈡埛ID"`
SalesSourcesId int `json:"sales_sources_id" gorm:"column:sales_sources_id;type:int(11);comment:鍟嗘満鏉ユ簮ID"`
SaleTypeId int `json:"sale_type_id" gorm:"column:sale_type_id;type:int(11);comment:鍟嗘満绫诲瀷ID"`
+ SaleType SaleType `json:"sale_type" `
SaleStageId int `json:"sale_stage_id" gorm:"column:sale_stage_id;type:int(11);comment:鍟嗘満闃舵ID"`
SaleStage SaleStage `json:"sale_stage" gorm:"foreignKey:SaleStageId;references:Id"`
MemberId int `json:"member_id" gorm:"column:member_id;type:int(11);comment:閿�鍞礋璐ｄ汉ID"`
Member User `json:"member" gorm:"foreignKey:MemberId"`
RegularCustomersId int `json:"regular_customers_id" gorm:"column:regular_customers_id;type:int(11);comment:甯稿ID"`
+ RegularCustomers RegularCustomers `json:"regular_customers"`
Competitors string `json:"competitors" gorm:"column:competitors;type:varchar(255);comment:绔炰簤瀵规墜"`
PossibilitiesId int `json:"possibilities_id" gorm:"column:possibilities_id;type:int(11);comment:鍙兘鎬D"`
Possibility Possibility `json:"possibility" gorm:"foreignKey:PossibilitiesId;references:Id"`
@@ -43,7 +45,7 @@
Contact Contact `json:"contact" gorm:"foreignKey:ContactId;references:Id"`
Client Client `json:"client" gorm:"foreignKey:ClientId;references:Id"`
CollectionProjections []CollectionProjection `json:"collection_projections" gorm:"foreignKey:SaleChanceId"`
- SalesSources SalesSources
+ SalesSources SalesSources `json:"sales_sources"`
Address
gorm.Model `json:"-"`
}
@@ -155,7 +157,7 @@
db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)
}
- err := db.Preload("SalesSources").Preload("Member").Preload("SaleStage").Preload("Possibility").Preload("CollectionProjections").Preload("Client").Preload("Contact").Find(&records).Error
+ err := db.Preload("SaleType").Preload("RegularCustomers").Preload("SalesSources").Preload("Member").Preload("SaleStage").Preload("Possibility").Preload("CollectionProjections").Preload("Client").Preload("Contact").Order("id desc").Find(&records).Error
return records, total, err
}
diff --git a/model/salesLeads.go b/model/salesLeads.go
index b854d46..03ff127 100644
--- a/model/salesLeads.go
+++ b/model/salesLeads.go
@@ -133,7 +133,7 @@
db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)
}
- err := db.Preload("FollowRecord").Find(&records).Error
+ err := db.Preload("Province").Preload("City").Preload("FollowRecord").Find(&records).Error
return records, total, err
}
--
Gitblit v1.8.0