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
---
docs/swagger.yaml | 140 +++++++++++++++++++++++++++-------------------
1 files changed, 81 insertions(+), 59 deletions(-)
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index c473c3e..a27c9b3 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -762,6 +762,8 @@
$ref: '#/definitions/model.Quotation'
quotationId:
type: integer
+ sendTime:
+ type: string
serviceContractStatus:
$ref: '#/definitions/model.ServiceContractStatus'
statusId:
@@ -895,6 +897,8 @@
clientId:
description: 瀹㈡埛id
type: integer
+ codeStandID:
+ type: string
courierCompany:
$ref: '#/definitions/model.CourierCompany'
courierCompanyId:
@@ -921,6 +925,8 @@
invoiceTypeId:
description: 鍙戠エ绫诲瀷id
type: integer
+ number:
+ type: string
principalId:
description: 閿�鍞礋璐ｄ汉id
type: integer
@@ -1339,6 +1345,10 @@
$ref: '#/definitions/model.Possibility'
process:
type: string
+ products:
+ items:
+ $ref: '#/definitions/model.Product'
+ type: array
projected_amount:
type: number
province:
@@ -1369,8 +1379,12 @@
type: integer
solutions:
type: string
+ status:
+ allOf:
+ - $ref: '#/definitions/model.Status'
+ description: 鐘舵��
status_id:
- $ref: '#/definitions/model.Status'
+ type: integer
threats:
type: string
whether_established:
@@ -1427,6 +1441,8 @@
type: integer
creatorName:
type: string
+ deliverType:
+ type: integer
deliveryDate:
type: string
id:
@@ -1447,6 +1463,10 @@
items:
$ref: '#/definitions/model.Product'
type: array
+ quotation:
+ $ref: '#/definitions/model.Quotation'
+ quotationId:
+ type: integer
remark:
type: string
saleChance:
@@ -1523,8 +1543,6 @@
allOf:
- $ref: '#/definitions/model.RefundType'
description: 閫�娆炬柟寮�
- Source:
- $ref: '#/definitions/model.SalesReturn'
amountTotal:
description: 浠风◣鍚堣
type: number
@@ -1569,6 +1587,8 @@
refundTypeId:
description: 閫�娆炬柟寮廔D
type: integer
+ salesReturn:
+ $ref: '#/definitions/model.SalesReturn'
sourceId:
description: 婧愬崟id
type: integer
@@ -1986,6 +2006,9 @@
type: integer
severity:
$ref: '#/definitions/model.Severity'
+ severityId:
+ description: 涓ラ噸绋嬪害id
+ type: integer
solution:
description: 瑙ｅ喅鏂规硶
type: string
@@ -2208,8 +2231,6 @@
client_type_id:
description: 瀹㈡埛绫诲瀷ID
type: integer
- codeRule:
- $ref: '#/definitions/code.CodeStandard'
codeStandID:
description: 缂栫爜id
type: string
@@ -2356,8 +2377,6 @@
properties:
client_id:
type: integer
- codeRule:
- $ref: '#/definitions/code.CodeStandard'
codeStandID:
description: 缂栫爜id
type: string
@@ -2372,6 +2391,9 @@
type: string
quotation_id:
type: integer
+ sendTime:
+ description: 鍙戣揣鏃堕棿
+ type: string
status_id:
type: integer
type: object
@@ -2462,6 +2484,8 @@
clientId:
description: 瀹㈡埛id
type: integer
+ codeStandID:
+ type: string
courierCompanyId:
description: 鐗╂祦鍏徃
type: integer
@@ -2480,6 +2504,9 @@
invoiceTypeId:
description: 鍙戠エ绫诲瀷id
type: integer
+ number:
+ description: 鍙戠エ缂栧彿
+ type: string
principalId:
description: 閿�鍞礋璐ｄ汉id
type: integer
@@ -2534,8 +2561,6 @@
properties:
client_id:
type: integer
- codeRule:
- $ref: '#/definitions/code.CodeStandard'
codeStandID:
description: 缂栫爜id
type: string
@@ -2614,8 +2639,6 @@
properties:
client_id:
type: integer
- codeRule:
- $ref: '#/definitions/code.CodeStandard'
codeStandID:
description: 缂栫爜id
type: string
@@ -2769,8 +2792,6 @@
type: integer
client_id:
type: integer
- codeRule:
- $ref: '#/definitions/code.CodeStandard'
codeStandID:
description: 缂栫爜id
type: string
@@ -2806,6 +2827,10 @@
type: integer
process:
type: string
+ products:
+ items:
+ $ref: '#/definitions/model.Product'
+ type: array
projected_amount:
type: number
province_id:
@@ -2853,13 +2878,14 @@
type: string
clientId:
type: integer
- codeRule:
- $ref: '#/definitions/code.CodeStandard'
codeStandID:
description: 缂栫爜id
type: string
conditions:
type: string
+ deliverType:
+ description: 浜や粯绫诲瀷:1.涓�娆″彂璐�,2.澶氭鍙戣揣
+ type: integer
deliveryDate:
type: string
logisticCompany:
@@ -2878,6 +2904,8 @@
items:
$ref: '#/definitions/model.Product'
type: array
+ quotationId:
+ type: integer
remark:
type: string
saleChanceId:
@@ -2893,8 +2921,6 @@
properties:
city_id:
type: integer
- codeRule:
- $ref: '#/definitions/code.CodeStandard'
codeStandID:
description: 缂栫爜id
type: string
@@ -2976,8 +3002,6 @@
properties:
clientId:
type: integer
- codeRule:
- $ref: '#/definitions/code.CodeStandard'
codeStandID:
description: 缂栫爜id
type: string
@@ -3053,8 +3077,6 @@
client_type_id:
description: 瀹㈡埛绫诲瀷ID
type: integer
- codeRule:
- $ref: '#/definitions/code.CodeStandard'
codeStandID:
description: 缂栫爜id
type: string
@@ -3123,8 +3145,6 @@
properties:
clientId:
type: integer
- codeRule:
- $ref: '#/definitions/code.CodeStandard'
codeStandID:
description: 缂栫爜id
type: string
@@ -3170,8 +3190,6 @@
clientId:
description: 瀹㈡埛id
type: integer
- codeRule:
- $ref: '#/definitions/code.CodeStandard'
codeStandID:
description: 缂栫爜id
type: string
@@ -3226,7 +3244,7 @@
serviceTypeId:
description: 鏈嶅姟鏂瑰紡id
type: integer
- severity:
+ severityId:
description: 涓ラ噸绋嬪害id
type: integer
solution:
@@ -3281,8 +3299,6 @@
properties:
clientId:
type: integer
- codeRule:
- $ref: '#/definitions/code.CodeStandard'
codeStandID:
description: 缂栫爜id
type: string
@@ -3538,8 +3554,6 @@
type: integer
client_status_id:
type: integer
- codeRule:
- $ref: '#/definitions/code.CodeStandard'
codeStandID:
type: string
contact_id:
@@ -3958,13 +3972,14 @@
type: string
clientId:
type: integer
- codeRule:
- $ref: '#/definitions/code.CodeStandard'
codeStandID:
description: 缂栫爜id
type: string
conditions:
type: string
+ deliverType:
+ description: 浜や粯绫诲瀷:1.涓�娆″彂璐�,2.澶氭鍙戣揣
+ type: integer
deliveryDate:
type: string
logisticCompany:
@@ -3983,6 +3998,8 @@
items:
$ref: '#/definitions/model.Product'
type: array
+ quotationId:
+ type: integer
remark:
type: string
saleChanceId:
@@ -4001,8 +4018,6 @@
type: integer
clientId:
type: integer
- codeRule:
- $ref: '#/definitions/code.CodeStandard'
codeStandID:
description: 缂栫爜id
type: string
@@ -4038,8 +4053,6 @@
properties:
clientId:
type: integer
- codeRule:
- $ref: '#/definitions/code.CodeStandard'
codeStandID:
description: 缂栫爜id
type: string
@@ -4175,8 +4188,6 @@
client_type_id:
description: 瀹㈡埛绫诲瀷ID
type: integer
- codeRule:
- $ref: '#/definitions/code.CodeStandard'
codeStandID:
description: 缂栫爜id
type: string
@@ -4379,8 +4390,6 @@
properties:
client_id:
type: integer
- codeRule:
- $ref: '#/definitions/code.CodeStandard'
codeStandID:
description: 缂栫爜id
type: string
@@ -4397,6 +4406,9 @@
type: string
quotation_id:
type: integer
+ sendTime:
+ description: 鍙戣揣鏃堕棿
+ type: string
status_id:
type: integer
type: object
@@ -4550,6 +4562,8 @@
clientId:
description: 瀹㈡埛id
type: integer
+ codeStandID:
+ type: string
courierCompanyId:
description: 鐗╂祦鍏徃
type: integer
@@ -4570,6 +4584,9 @@
invoiceTypeId:
description: 鍙戠エ绫诲瀷id
type: integer
+ number:
+ description: 鍙戠エ缂栧彿
+ type: string
principalId:
description: 閿�鍞礋璐ｄ汉id
type: integer
@@ -4649,8 +4666,6 @@
properties:
client_id:
type: integer
- codeRule:
- $ref: '#/definitions/code.CodeStandard'
codeStandID:
description: 缂栫爜id
type: string
@@ -4770,8 +4785,6 @@
properties:
client_id:
type: integer
- codeRule:
- $ref: '#/definitions/code.CodeStandard'
codeStandID:
description: 缂栫爜id
type: string
@@ -5008,8 +5021,6 @@
type: integer
client_id:
type: integer
- codeRule:
- $ref: '#/definitions/code.CodeStandard'
codeStandID:
description: 缂栫爜id
type: string
@@ -5047,6 +5058,10 @@
type: integer
process:
type: string
+ products:
+ items:
+ $ref: '#/definitions/model.Product'
+ type: array
projected_amount:
type: number
province_id:
@@ -5123,8 +5138,6 @@
properties:
city_id:
type: integer
- codeRule:
- $ref: '#/definitions/code.CodeStandard'
codeStandID:
description: 缂栫爜id
type: string
@@ -5293,8 +5306,6 @@
properties:
clientId:
type: integer
- codeRule:
- $ref: '#/definitions/code.CodeStandard'
codeStandID:
description: 缂栫爜id
type: string
@@ -5384,8 +5395,6 @@
client_type_id:
description: 瀹㈡埛绫诲瀷ID
type: integer
- codeRule:
- $ref: '#/definitions/code.CodeStandard'
codeStandID:
description: 缂栫爜id
type: string
@@ -5454,8 +5463,6 @@
properties:
clientId:
type: integer
- codeRule:
- $ref: '#/definitions/code.CodeStandard'
codeStandID:
description: 缂栫爜id
type: string
@@ -5503,8 +5510,6 @@
clientId:
description: 瀹㈡埛id
type: integer
- codeRule:
- $ref: '#/definitions/code.CodeStandard'
codeStandID:
description: 缂栫爜id
type: string
@@ -5561,7 +5566,7 @@
serviceTypeId:
description: 鏈嶅姟鏂瑰紡id
type: integer
- severity:
+ severityId:
description: 涓ラ噸绋嬪害id
type: integer
solution:
@@ -5640,8 +5645,6 @@
properties:
clientId:
type: integer
- codeRule:
- $ref: '#/definitions/code.CodeStandard'
codeStandID:
description: 缂栫爜id
type: string
@@ -7013,6 +7016,25 @@
summary: 鏇存柊瀹㈡埛绫诲瀷
tags:
- ClientType
+ /api/code/getAutoCode:
+ post:
+ parameters:
+ - description: 鍙傛暟
+ in: body
+ name: object
+ required: true
+ schema:
+ $ref: '#/definitions/code.CodeStandard'
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: OK
+ schema:
+ $ref: '#/definitions/response.ListResponse'
+ summary: 鑾峰彇鑷姩缂栫爜
+ tags:
+ - 缂栫爜
/api/code/getCodeList:
get:
parameters:
--
Gitblit v1.8.0