From 32f4f2b0d507c99d9b4fb7d555b0c2523a92c503 Mon Sep 17 00:00:00 2001 From: liujiandao <274878379@qq.com> Date: 星期一, 15 四月 2024 15:08:12 +0800 Subject: [PATCH] 添加字段 --- models/operation.go | 9 +++- docs/swagger.yaml | 18 +++++++++ request/operation.go | 18 ++++++--- docs/docs.go | 27 +++++++++++++ docs/swagger.json | 27 +++++++++++++ 5 files changed, 90 insertions(+), 9 deletions(-) diff --git a/docs/docs.go b/docs/docs.go index e201b02..a9b4d8d 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -3625,6 +3625,9 @@ "accountant": { "type": "string" }, + "accountantId": { + "type": "string" + }, "auditDate": { "type": "string" }, @@ -3655,6 +3658,9 @@ "type": "string" }, "custodian": { + "type": "string" + }, + "custodianId": { "type": "string" }, "details": { @@ -3689,6 +3695,9 @@ "type": "number" }, "manager": { + "type": "string" + }, + "managerId": { "type": "string" }, "number": { @@ -4121,6 +4130,9 @@ "accountant": { "type": "string" }, + "accountantId": { + "type": "string" + }, "comment": { "description": "澶囨敞", "type": "string" @@ -4144,6 +4156,9 @@ "custodian": { "type": "string" }, + "custodianId": { + "type": "string" + }, "details": { "type": "array", "items": { @@ -4165,6 +4180,9 @@ "type": "number" }, "manager": { + "type": "string" + }, + "managerId": { "type": "string" }, "number": { @@ -4864,6 +4882,9 @@ "accountant": { "type": "string" }, + "accountantId": { + "type": "string" + }, "baseOperationType": { "description": "鍩虹浣滀笟绫诲瀷", "allOf": [ @@ -4895,6 +4916,9 @@ "custodian": { "type": "string" }, + "custodianId": { + "type": "string" + }, "details": { "type": "array", "items": { @@ -4918,6 +4942,9 @@ "manager": { "type": "string" }, + "managerId": { + "type": "string" + }, "number": { "description": "鍗曞彿", "type": "string" diff --git a/docs/swagger.json b/docs/swagger.json index 7b47605..ef51205 100644 --- a/docs/swagger.json +++ b/docs/swagger.json @@ -3613,6 +3613,9 @@ "accountant": { "type": "string" }, + "accountantId": { + "type": "string" + }, "auditDate": { "type": "string" }, @@ -3643,6 +3646,9 @@ "type": "string" }, "custodian": { + "type": "string" + }, + "custodianId": { "type": "string" }, "details": { @@ -3677,6 +3683,9 @@ "type": "number" }, "manager": { + "type": "string" + }, + "managerId": { "type": "string" }, "number": { @@ -4109,6 +4118,9 @@ "accountant": { "type": "string" }, + "accountantId": { + "type": "string" + }, "comment": { "description": "澶囨敞", "type": "string" @@ -4132,6 +4144,9 @@ "custodian": { "type": "string" }, + "custodianId": { + "type": "string" + }, "details": { "type": "array", "items": { @@ -4153,6 +4168,9 @@ "type": "number" }, "manager": { + "type": "string" + }, + "managerId": { "type": "string" }, "number": { @@ -4852,6 +4870,9 @@ "accountant": { "type": "string" }, + "accountantId": { + "type": "string" + }, "baseOperationType": { "description": "鍩虹浣滀笟绫诲瀷", "allOf": [ @@ -4883,6 +4904,9 @@ "custodian": { "type": "string" }, + "custodianId": { + "type": "string" + }, "details": { "type": "array", "items": { @@ -4906,6 +4930,9 @@ "manager": { "type": "string" }, + "managerId": { + "type": "string" + }, "number": { "description": "鍗曞彿", "type": "string" diff --git a/docs/swagger.yaml b/docs/swagger.yaml index 2fb4dd5..223308f 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -676,6 +676,8 @@ properties: accountant: type: string + accountantId: + type: string auditDate: type: string baseOperationType: @@ -695,6 +697,8 @@ createTime: type: string custodian: + type: string + custodianId: type: string details: items: @@ -717,6 +721,8 @@ description: 鐗╂祦閲嶉噺 type: number manager: + type: string + managerId: type: string number: description: 鍗曞彿 @@ -1010,6 +1016,8 @@ properties: accountant: type: string + accountantId: + type: string comment: description: 澶囨敞 type: string @@ -1027,6 +1035,8 @@ type: string custodian: type: string + custodianId: + type: string details: items: $ref: '#/definitions/request.OperationDetails' @@ -1042,6 +1052,8 @@ description: 鐗╂祦閲嶉噺 type: number manager: + type: string + managerId: type: string number: description: 鍗曞彿 @@ -1528,6 +1540,8 @@ properties: accountant: type: string + accountantId: + type: string baseOperationType: allOf: - $ref: '#/definitions/constvar.BaseOperationType' @@ -1549,6 +1563,8 @@ type: string custodian: type: string + custodianId: + type: string details: items: $ref: '#/definitions/request.OperationDetails' @@ -1565,6 +1581,8 @@ type: number manager: type: string + managerId: + type: string number: description: 鍗曞彿 type: string diff --git a/models/operation.go b/models/operation.go index 15e2fd9..ccf54fd 100644 --- a/models/operation.go +++ b/models/operation.go @@ -50,9 +50,12 @@ ToLocation Location `json:"toLocation" gorm:"foreignKey:ToLocationID;references:Id"` //鐩爣浣嶇疆 SalesDetailsNumber string `gorm:"type:varchar(191);comment:閿�鍞槑缁嗙紪鐮�" json:"salesDetailsNumber"` - Manager string `json:"manager" gorm:"type:varchar(255);comment:涓荤"` - Accountant string `json:"accountant" gorm:"type:varchar(255);comment:浼氳"` - Custodian string `json:"custodian" gorm:"type:varchar(255);comment:淇濈鍛�"` + ManagerId string `json:"managerId" gorm:"type:varchar(255);comment:涓荤id"` + Manager string `json:"manager" gorm:"type:varchar(255);comment:涓荤鍚嶇О"` + AccountantId string `json:"accountantId" gorm:"type:varchar(255);comment:浼氳id"` + Accountant string `json:"accountant" gorm:"type:varchar(255);comment:浼氳鍚嶇О"` + CustodianId string `json:"custodianId" gorm:"type:varchar(255);comment:淇濈鍛榠d"` + Custodian string `json:"custodian" gorm:"type:varchar(255);comment:淇濈鍛樺悕绉�"` } OperationSearch struct { diff --git a/request/operation.go b/request/operation.go index 2f2050a..2724441 100644 --- a/request/operation.go +++ b/request/operation.go @@ -30,9 +30,12 @@ ReceiverAddr string `json:"receiverAddr" gorm:"type:varchar(255);comment:鏀惰揣鍦板潃"` LocationId int `json:"locationId" gorm:"type:int;not null;comment:婧愪綅缃甶d"` //婧愪綅缃甶d ToLocationId int `json:"toLocationId" gorm:"type:int;not null;comment:浠撳簱浣嶇疆id"` //鐩爣浣嶇疆id - Manager string `json:"manager" gorm:"type:varchar(255);comment:涓荤"` - Accountant string `json:"accountant" gorm:"type:varchar(255);comment:浼氳"` - Custodian string `json:"custodian" gorm:"type:varchar(255);comment:淇濈鍛�"` + ManagerId string `json:"managerId" gorm:"type:varchar(255);comment:涓荤id"` + Manager string `json:"manager" gorm:"type:varchar(255);comment:涓荤鍚嶇О"` + AccountantId string `json:"accountantId" gorm:"type:varchar(255);comment:浼氳id"` + Accountant string `json:"accountant" gorm:"type:varchar(255);comment:浼氳鍚嶇О"` + CustodianId string `json:"custodianId" gorm:"type:varchar(255);comment:淇濈鍛榠d"` + Custodian string `json:"custodian" gorm:"type:varchar(255);comment:淇濈鍛樺悕绉�"` } type OperationDetails struct { @@ -79,9 +82,12 @@ ReceiverAddr string `json:"receiverAddr" gorm:"type:varchar(255);comment:鏀惰揣鍦板潃"` LocationId int `json:"locationId" gorm:"type:int;not null;comment:婧愪綅缃甶d"` //婧愪綅缃甶d ToLocationId int `json:"toLocationId" gorm:"type:int;not null;comment:浠撳簱浣嶇疆id"` //鐩爣浣嶇疆id - Manager string `json:"manager" gorm:"type:varchar(255);comment:涓荤"` - Accountant string `json:"accountant" gorm:"type:varchar(255);comment:浼氳"` - Custodian string `json:"custodian" gorm:"type:varchar(255);comment:淇濈鍛�"` + ManagerId string `json:"managerId" gorm:"type:varchar(255);comment:涓荤id"` + Manager string `json:"manager" gorm:"type:varchar(255);comment:涓荤鍚嶇О"` + AccountantId string `json:"accountantId" gorm:"type:varchar(255);comment:浼氳id"` + Accountant string `json:"accountant" gorm:"type:varchar(255);comment:浼氳鍚嶇О"` + CustodianId string `json:"custodianId" gorm:"type:varchar(255);comment:淇濈鍛榠d"` + Custodian string `json:"custodian" gorm:"type:varchar(255);comment:淇濈鍛樺悕绉�"` } type OperationAllList struct { -- Gitblit v1.8.0