From dae660c3b5b6a9b7b32f40e88a576b81a1054561 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期五, 12 四月 2024 17:55:29 +0800
Subject: [PATCH] 字段修改
---
controllers/request/yield_register_request.go | 12 +++---
models/yield_register.go | 10 ++--
docs/swagger.yaml | 16 ++++----
controllers/yield_register_controller.go | 6 ++-
docs/docs.go | 18 ++++----
docs/swagger.json | 18 ++++----
6 files changed, 41 insertions(+), 39 deletions(-)
diff --git a/controllers/request/yield_register_request.go b/controllers/request/yield_register_request.go
index 066b152..6331b25 100644
--- a/controllers/request/yield_register_request.go
+++ b/controllers/request/yield_register_request.go
@@ -13,7 +13,7 @@
Number string `json:"number"` //缂栧彿
CreateTime string `json:"createTime"` //鍒涘缓鏃堕棿
MarketId uint `json:"marketId"` //搴勫彛id
- WorkshopId uint `json:"workshopId"` //杞﹂棿id
+ WorkshopNumber string `json:"workshopNumber"` //杞﹂棿缂栫爜
GroupNumber int `json:"groupNumber"` //缁勫埆
Spec string `json:"spec"` //瑙勬牸
JieZhuang string `json:"jieZhuang"` //鏄惁缁撳簞
@@ -67,9 +67,9 @@
}
type ChangeYieldRegister struct {
- CreateTime string `json:"createTime"` //鍒涘缓鏃堕棿
- MarketId uint `json:"marketId"` //搴勫彛id
- WorkshopId uint `json:"workshopId"` //杞﹂棿id
- GroupNumber int `json:"groupNumber"` //缁勫埆
- Spec string `json:"spec"` //瑙勬牸
+ CreateTime string `json:"createTime"` //鍒涘缓鏃堕棿
+ MarketId uint `json:"marketId"` //搴勫彛id
+ WorkshopNumber string `json:"workshopNumber"` //杞﹂棿缂栫爜
+ GroupNumber int `json:"groupNumber"` //缁勫埆
+ Spec string `json:"spec"` //瑙勬牸
}
diff --git a/controllers/yield_register_controller.go b/controllers/yield_register_controller.go
index 1b26acb..f7c64cb 100644
--- a/controllers/yield_register_controller.go
+++ b/controllers/yield_register_controller.go
@@ -108,7 +108,9 @@
for _, dict := range all {
if register.MarketId == dict.ID {
register.MarketName = dict.Name
- break
+ }
+ if register.WorkshopNumber == dict.Number {
+ register.WorkshopName = dict.Name
}
}
}
@@ -203,7 +205,7 @@
return
}
first, err := models.NewYieldRegisterSearch().SetGroupNumber(params.GroupNumber).SetCreateTime(params.CreateTime).
- SetMarketId(params.MarketId).SetWorkshopId(params.WorkshopId).SetSpec(params.Spec).SetPreload(true).First()
+ SetMarketId(params.MarketId).SetWorkshopNumber(params.WorkshopNumber).SetSpec(params.Spec).SetPreload(true).First()
if err != nil {
util.ResponseFormat(c, code.RequestParamError, "鏌ヨ澶辫触")
return
diff --git a/docs/docs.go b/docs/docs.go
index 7cd638e..3a2131b 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -1701,11 +1701,11 @@
"vehicleSpeed": {
"type": "number"
},
- "workshopId": {
- "type": "integer"
- },
"workshopName": {
"description": "杞﹂棿鍚�",
+ "type": "string"
+ },
+ "workshopNumber": {
"type": "string"
}
}
@@ -1890,9 +1890,9 @@
"description": "瑙勬牸",
"type": "string"
},
- "workshopId": {
- "description": "杞﹂棿id",
- "type": "integer"
+ "workshopNumber": {
+ "description": "杞﹂棿缂栫爜",
+ "type": "string"
}
}
},
@@ -2226,9 +2226,9 @@
"description": "瀹炴椂杞﹂��",
"type": "number"
},
- "workshopId": {
- "description": "杞﹂棿id",
- "type": "integer"
+ "workshopNumber": {
+ "description": "杞﹂棿缂栫爜",
+ "type": "string"
}
}
},
diff --git a/docs/swagger.json b/docs/swagger.json
index fd10c8b..d8f2eae 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -1689,11 +1689,11 @@
"vehicleSpeed": {
"type": "number"
},
- "workshopId": {
- "type": "integer"
- },
"workshopName": {
"description": "杞﹂棿鍚�",
+ "type": "string"
+ },
+ "workshopNumber": {
"type": "string"
}
}
@@ -1878,9 +1878,9 @@
"description": "瑙勬牸",
"type": "string"
},
- "workshopId": {
- "description": "杞﹂棿id",
- "type": "integer"
+ "workshopNumber": {
+ "description": "杞﹂棿缂栫爜",
+ "type": "string"
}
}
},
@@ -2214,9 +2214,9 @@
"description": "瀹炴椂杞﹂��",
"type": "number"
},
- "workshopId": {
- "description": "杞﹂棿id",
- "type": "integer"
+ "workshopNumber": {
+ "description": "杞﹂棿缂栫爜",
+ "type": "string"
}
}
},
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index c137ee3..da57293 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -382,10 +382,10 @@
type: string
vehicleSpeed:
type: number
- workshopId:
- type: integer
workshopName:
description: 杞﹂棿鍚�
+ type: string
+ workshopNumber:
type: string
type: object
models.YieldRegisterCircle:
@@ -512,9 +512,9 @@
spec:
description: 瑙勬牸
type: string
- workshopId:
- description: 杞﹂棿id
- type: integer
+ workshopNumber:
+ description: 杞﹂棿缂栫爜
+ type: string
type: object
request.DynamicsRank:
properties:
@@ -749,9 +749,9 @@
vehicleSpeed:
description: 瀹炴椂杞﹂��
type: number
- workshopId:
- description: 杞﹂棿id
- type: integer
+ workshopNumber:
+ description: 杞﹂棿缂栫爜
+ type: string
type: object
request.YieldRegisterItemInfo:
properties:
diff --git a/models/yield_register.go b/models/yield_register.go
index 8508d60..35fe2f0 100644
--- a/models/yield_register.go
+++ b/models/yield_register.go
@@ -14,7 +14,7 @@
Number string `json:"number" gorm:"type:varchar(255);not null;comment:缂栧彿"`
CreateTime string `json:"createTime" gorm:"type:varchar(255);comment:鍒涘缓鏃堕棿"`
MarketId uint `json:"marketId" gorm:"type:int(11);comment:搴勫彛id"`
- WorkshopId uint `json:"workshopId" gorm:"type:int(11);comment:杞﹂棿id"`
+ WorkshopNumber string `json:"workshopNumber" gorm:"type:varchar(255);comment:杞﹂棿缂栫爜"`
GroupNumber int `json:"groupNumber" gorm:"type:int(11);comment:缁勫埆"`
Spec string `json:"spec" gorm:"type:varchar(255);comment:瑙勬牸"`
JieZhuang string `json:"jieZhuang" gorm:"type:varchar(255);comment:鏄惁缁撳簞"`
@@ -93,8 +93,8 @@
return slf
}
-func (slf *YieldRegisterSearch) SetWorkshopId(workshopId uint) *YieldRegisterSearch {
- slf.WorkshopId = workshopId
+func (slf *YieldRegisterSearch) SetWorkshopNumber(workshopNumber string) *YieldRegisterSearch {
+ slf.WorkshopNumber = workshopNumber
return slf
}
@@ -123,8 +123,8 @@
db = db.Where("create_time = ?", slf.CreateTime)
}
- if slf.WorkshopId > 0 {
- db = db.Where("workshop_id = ?", slf.WorkshopId)
+ if slf.WorkshopNumber != "" {
+ db = db.Where("workshop_number = ?", slf.WorkshopNumber)
}
if slf.MarketId > 0 {
--
Gitblit v1.8.0