From 0e8be85f382fbad5b003f6f86768ef799e2c027d Mon Sep 17 00:00:00 2001 From: zhangqian <zhangqian@123.com> Date: 星期二, 15 八月 2023 14:47:02 +0800 Subject: [PATCH] fix --- model/serviceContract.go | 4 ++++ api/v1/serviceContract.go | 21 --------------------- docs/swagger.yaml | 4 ++++ docs/docs.go | 6 ++++++ docs/swagger.json | 6 ++++++ 5 files changed, 20 insertions(+), 21 deletions(-) diff --git a/api/v1/serviceContract.go b/api/v1/serviceContract.go index bd10717..7cf4b9d 100644 --- a/api/v1/serviceContract.go +++ b/api/v1/serviceContract.go @@ -98,27 +98,6 @@ ctx.Ok() } -// check params -func checkServiceContractParams(serviceContract request.ServiceContract) (errCode int, result model.ServiceContract) { - result.Number = serviceContract.Number - result.MemberId = serviceContract.MemberId - result.Remark = serviceContract.Remark - result.ClientId = serviceContract.ClientId - result.SalesDetailsId = serviceContract.SalesDetailsId - result.SaleChanceId = serviceContract.SaleChanceId - result.QuotationId = serviceContract.QuotationId - result.ServiceContractTypeId = serviceContract.TypeId - result.ServiceContractStatusId = serviceContract.StatusId - result.ServiceTimes = serviceContract.ServiceTimes - result.Terms = serviceContract.Terms - result.Products = serviceContract.Products - result.SignTime = serviceContract.SignTime - result.StartTime = serviceContract.StartTime - result.EndTime = serviceContract.EndTime - - return ecode.OK, result -} - // List // // @Tags ServiceContract diff --git a/docs/docs.go b/docs/docs.go index 78076e2..0236c2f 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -11968,6 +11968,9 @@ "id": { "type": "integer" }, + "member": { + "$ref": "#/definitions/model.User" + }, "member_id": { "type": "integer" }, @@ -12301,6 +12304,9 @@ "id": { "type": "integer" }, + "member": { + "$ref": "#/definitions/model.User" + }, "memberId": { "type": "integer" }, diff --git a/docs/swagger.json b/docs/swagger.json index fba412a..1465934 100644 --- a/docs/swagger.json +++ b/docs/swagger.json @@ -11956,6 +11956,9 @@ "id": { "type": "integer" }, + "member": { + "$ref": "#/definitions/model.User" + }, "member_id": { "type": "integer" }, @@ -12289,6 +12292,9 @@ "id": { "type": "integer" }, + "member": { + "$ref": "#/definitions/model.User" + }, "memberId": { "type": "integer" }, diff --git a/docs/swagger.yaml b/docs/swagger.yaml index 968a045..6628e6d 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -1381,6 +1381,8 @@ type: array id: type: integer + member: + $ref: '#/definitions/model.User' member_id: type: integer name: @@ -1603,6 +1605,8 @@ type: string id: type: integer + member: + $ref: '#/definitions/model.User' memberId: type: integer number: diff --git a/model/serviceContract.go b/model/serviceContract.go index 526b545..cb75f98 100644 --- a/model/serviceContract.go +++ b/model/serviceContract.go @@ -17,6 +17,7 @@ Client Client `json:"client" gorm:"foreignKey:ClientId"` Number string `json:"number" gorm:"column:number;type:varchar(255);comment:鍚堝悓缂栧彿"` MemberId int `json:"memberId" gorm:"column:member_id;type:int;comment:璐熻矗浜篿d"` + Member User `json:"member" gorm:"foreignKey:MemberId"` ContactId int `json:"contactId" gorm:"column:contact_id;type:int;comment:鑱旂郴浜篿d"` Contact Contact `json:"contact" gorm:"foreignKey:ContactId"` SaleChanceId int `json:"saleChanceId" gorm:"column:sale_chance_id;type:int;comment:閿�鍞満浼歩d"` @@ -109,6 +110,9 @@ } if slf.Preload { db = db. + Preload("Client"). + Preload("Member"). + Preload("Contact"). Preload("SaleChance"). Preload("SalesDetails"). Preload("Quotation"). -- Gitblit v1.8.0