From 13758bde7d19cb2738a801de46052ae284ff6a7e Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期四, 24 八月 2023 11:03:28 +0800
Subject: [PATCH] fix
---
model/request/serviceContract.go | 34 ++++++-----
docs/swagger.yaml | 20 ++++++
docs/docs.go | 36 ++++++++++++
docs/swagger.json | 36 ++++++++++++
4 files changed, 110 insertions(+), 16 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index 942f99c..5d854fc 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -11845,6 +11845,14 @@
"description": "璐︽埛id",
"type": "integer"
},
+ "client": {
+ "description": "瀹㈡埛id",
+ "allOf": [
+ {
+ "$ref": "#/definitions/model.Client"
+ }
+ ]
+ },
"clientId": {
"description": "瀹㈡埛id",
"type": "integer"
@@ -13877,6 +13885,14 @@
"description": "璐︽埛id",
"type": "integer"
},
+ "client": {
+ "description": "瀹㈡埛id",
+ "allOf": [
+ {
+ "$ref": "#/definitions/model.Client"
+ }
+ ]
+ },
"clientId": {
"description": "瀹㈡埛id",
"type": "integer"
@@ -14331,6 +14347,12 @@
"type": "integer"
},
"salesDetailsId": {
+ "type": "integer"
+ },
+ "serviceContractStatusId": {
+ "type": "integer"
+ },
+ "serviceContractTypeId": {
"type": "integer"
},
"serviceTimes": {
@@ -16930,6 +16952,14 @@
"description": "璐︽埛id",
"type": "integer"
},
+ "client": {
+ "description": "瀹㈡埛id",
+ "allOf": [
+ {
+ "$ref": "#/definitions/model.Client"
+ }
+ ]
+ },
"clientId": {
"description": "瀹㈡埛id",
"type": "integer"
@@ -17608,6 +17638,12 @@
"salesDetailsId": {
"type": "integer"
},
+ "serviceContractStatusId": {
+ "type": "integer"
+ },
+ "serviceContractTypeId": {
+ "type": "integer"
+ },
"serviceTimes": {
"type": "integer"
},
diff --git a/docs/swagger.json b/docs/swagger.json
index 67b8d09..4e3ab43 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -11833,6 +11833,14 @@
"description": "璐︽埛id",
"type": "integer"
},
+ "client": {
+ "description": "瀹㈡埛id",
+ "allOf": [
+ {
+ "$ref": "#/definitions/model.Client"
+ }
+ ]
+ },
"clientId": {
"description": "瀹㈡埛id",
"type": "integer"
@@ -13865,6 +13873,14 @@
"description": "璐︽埛id",
"type": "integer"
},
+ "client": {
+ "description": "瀹㈡埛id",
+ "allOf": [
+ {
+ "$ref": "#/definitions/model.Client"
+ }
+ ]
+ },
"clientId": {
"description": "瀹㈡埛id",
"type": "integer"
@@ -14319,6 +14335,12 @@
"type": "integer"
},
"salesDetailsId": {
+ "type": "integer"
+ },
+ "serviceContractStatusId": {
+ "type": "integer"
+ },
+ "serviceContractTypeId": {
"type": "integer"
},
"serviceTimes": {
@@ -16918,6 +16940,14 @@
"description": "璐︽埛id",
"type": "integer"
},
+ "client": {
+ "description": "瀹㈡埛id",
+ "allOf": [
+ {
+ "$ref": "#/definitions/model.Client"
+ }
+ ]
+ },
"clientId": {
"description": "瀹㈡埛id",
"type": "integer"
@@ -17596,6 +17626,12 @@
"salesDetailsId": {
"type": "integer"
},
+ "serviceContractStatusId": {
+ "type": "integer"
+ },
+ "serviceContractTypeId": {
+ "type": "integer"
+ },
"serviceTimes": {
"type": "integer"
},
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index eae5e70..d175423 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -1158,6 +1158,10 @@
bankAccountId:
description: 璐︽埛id
type: integer
+ client:
+ allOf:
+ - $ref: '#/definitions/model.Client'
+ description: 瀹㈡埛id
clientId:
description: 瀹㈡埛id
type: integer
@@ -2523,6 +2527,10 @@
bankAccountId:
description: 璐︽埛id
type: integer
+ client:
+ allOf:
+ - $ref: '#/definitions/model.Client'
+ description: 瀹㈡埛id
clientId:
description: 瀹㈡埛id
type: integer
@@ -2821,6 +2829,10 @@
saleChanceId:
type: integer
salesDetailsId:
+ type: integer
+ serviceContractStatusId:
+ type: integer
+ serviceContractTypeId:
type: integer
serviceTimes:
type: integer
@@ -4613,6 +4625,10 @@
bankAccountId:
description: 璐︽埛id
type: integer
+ client:
+ allOf:
+ - $ref: '#/definitions/model.Client'
+ description: 瀹㈡埛id
clientId:
description: 瀹㈡埛id
type: integer
@@ -5062,6 +5078,10 @@
type: integer
salesDetailsId:
type: integer
+ serviceContractStatusId:
+ type: integer
+ serviceContractTypeId:
+ type: integer
serviceTimes:
type: integer
signTime:
diff --git a/model/request/serviceContract.go b/model/request/serviceContract.go
index 5e179a5..dddcfd5 100644
--- a/model/request/serviceContract.go
+++ b/model/request/serviceContract.go
@@ -10,22 +10,24 @@
}
type ServiceContract struct {
- ClientId int `json:"clientId"`
- Number string `json:"number"`
- MemberId int `json:"memberId" binding:"required"`
- ContactId int `json:"contactId"`
- SaleChanceId int `json:"saleChanceId"`
- SalesDetailsId int `json:"salesDetailsId"`
- QuotationId int `json:"quotationId"`
- TypeId int `json:"typeId"`
- SignTime string `json:"signTime" binding:"datetime=2006-01-02"`
- StartTime string `json:"startTime"`
- EndTime string `json:"endTime"`
- StatusId int `json:"statusId"`
- ServiceTimes int `json:"serviceTimes"`
- Terms string `json:"terms"`
- Remark string `json:"remark"`
- Products []*model.Product `json:"products"`
+ ClientId int `json:"clientId"`
+ Number string `json:"number"`
+ MemberId int `json:"memberId" binding:"required"`
+ ContactId int `json:"contactId"`
+ SaleChanceId int `json:"saleChanceId"`
+ SalesDetailsId int `json:"salesDetailsId"`
+ QuotationId int `json:"quotationId"`
+ TypeId int `json:"typeId"`
+ SignTime string `json:"signTime" binding:"datetime=2006-01-02"`
+ StartTime string `json:"startTime"`
+ EndTime string `json:"endTime"`
+ StatusId int `json:"statusId"`
+ ServiceTimes int `json:"serviceTimes"`
+ Terms string `json:"terms"`
+ Remark string `json:"remark"`
+ Products []*model.Product `json:"products"`
+ ServiceContractTypeId int `json:"serviceContractTypeId"`
+ ServiceContractStatusId int `json:"serviceContractStatusId"`
}
type UpdateServiceContract struct {
--
Gitblit v1.8.0