From bedfbcbe3af9635d15d0cafece60fbd311159fe5 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期三, 10 四月 2024 13:51:08 +0800
Subject: [PATCH] 字段修改
---
models/yield_register.go | 4 ++
models/dict.go | 20 +++++++--
docs/swagger.yaml | 10 ++++
controllers/yield_register_controller.go | 14 +++++++
docs/docs.go | 13 ++++++
docs/swagger.json | 13 ++++++
models/raw_silk_price_standard.go | 3 +
7 files changed, 68 insertions(+), 9 deletions(-)
diff --git a/controllers/yield_register_controller.go b/controllers/yield_register_controller.go
index fbade43..9e09869 100644
--- a/controllers/yield_register_controller.go
+++ b/controllers/yield_register_controller.go
@@ -3,6 +3,7 @@
import (
"github.com/gin-gonic/gin"
"gorm.io/gorm"
+ "silkserver/constvar"
"silkserver/controllers/request"
"silkserver/extend/code"
"silkserver/extend/util"
@@ -84,6 +85,19 @@
util.ResponseFormat(c, code.RequestParamError, "鏌ヨ澶辫触")
return
}
+ all, err := models.NewDictSearch().SetDictTypes([]constvar.DictType{constvar.DictTypeMarket, constvar.DictTypeWorkshop}).FindAll()
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鏌ヨ澶辫触")
+ return
+ }
+ for _, register := range list {
+ for _, dict := range all {
+ if register.MarketId == dict.ID {
+ register.MarketName = dict.Name
+ break
+ }
+ }
+ }
util.ResponseFormatList(c, code.Success, list, total)
}
diff --git a/docs/docs.go b/docs/docs.go
index b65018f..e08b990 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -1307,7 +1307,10 @@
"id": {
"type": "integer"
},
- "marketNumber": {
+ "marketId": {
+ "type": "integer"
+ },
+ "marketName": {
"type": "string"
},
"notes": {
@@ -1425,6 +1428,10 @@
"marketId": {
"type": "integer"
},
+ "marketName": {
+ "description": "搴勫彛鍚�",
+ "type": "string"
+ },
"number": {
"type": "string"
},
@@ -1463,6 +1470,10 @@
},
"workshopId": {
"type": "integer"
+ },
+ "workshopName": {
+ "description": "杞﹂棿鍚�",
+ "type": "string"
}
}
},
diff --git a/docs/swagger.json b/docs/swagger.json
index c769c39..d57173c 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -1295,7 +1295,10 @@
"id": {
"type": "integer"
},
- "marketNumber": {
+ "marketId": {
+ "type": "integer"
+ },
+ "marketName": {
"type": "string"
},
"notes": {
@@ -1413,6 +1416,10 @@
"marketId": {
"type": "integer"
},
+ "marketName": {
+ "description": "搴勫彛鍚�",
+ "type": "string"
+ },
"number": {
"type": "string"
},
@@ -1451,6 +1458,10 @@
},
"workshopId": {
"type": "integer"
+ },
+ "workshopName": {
+ "description": "杞﹂棿鍚�",
+ "type": "string"
}
}
},
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index dd2307d..27b922f 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -267,7 +267,9 @@
$ref: '#/definitions/gorm.DeletedAt'
id:
type: integer
- marketNumber:
+ marketId:
+ type: integer
+ marketName:
type: string
notes:
type: string
@@ -345,6 +347,9 @@
type: string
marketId:
type: integer
+ marketName:
+ description: 搴勫彛鍚�
+ type: string
number:
type: string
oneBack:
@@ -371,6 +376,9 @@
type: number
workshopId:
type: integer
+ workshopName:
+ description: 杞﹂棿鍚�
+ type: string
type: object
models.YieldRegisterCircle:
properties:
diff --git a/models/dict.go b/models/dict.go
index 7e682d8..fd32dd3 100644
--- a/models/dict.go
+++ b/models/dict.go
@@ -19,11 +19,12 @@
DictSearch struct {
Dict
- Order string
- PageNum int
- PageSize int
- Orm *gorm.DB
- Keyword string
+ Order string
+ PageNum int
+ PageSize int
+ Orm *gorm.DB
+ Keyword string
+ DictTypes []constvar.DictType
}
)
@@ -75,6 +76,11 @@
return slf
}
+func (slf *DictSearch) SetDictTypes(dts []constvar.DictType) *DictSearch {
+ slf.DictTypes = dts
+ return slf
+}
+
func (slf *DictSearch) build() *gorm.DB {
var db = slf.Orm.Table(slf.TableName())
@@ -103,6 +109,10 @@
db = db.Where("name like ? or number like ?", kw, kw)
}
+ if len(slf.DictTypes) > 0 {
+ db = db.Where("dict_type in (?)", slf.DictTypes)
+ }
+
return db
}
diff --git a/models/raw_silk_price_standard.go b/models/raw_silk_price_standard.go
index d103af3..ac84ba4 100644
--- a/models/raw_silk_price_standard.go
+++ b/models/raw_silk_price_standard.go
@@ -11,7 +11,8 @@
type (
RawSilkPriceStandard struct {
gorm.Model
- MarketNumber string `json:"marketNumber" gorm:"type:varchar(255);comment:搴勫彛缂栧彿"`
+ MarketId uint `json:"marketId" gorm:"type:int(11);comment:搴勫彛id"`
+ MarketName string `json:"marketName" gorm:"type:varchar(255);comment:搴勫彛鍚嶇О"`
RawSilkGrade string `json:"rawSilkGrade" gorm:"type:varchar(255);comment:鐢熶笣绛夌骇"`
PayStandard decimal.Decimal `json:"payStandard" gorm:"type:decimal(20,3);comment:钖叕鏍囧噯"`
Unit string `json:"unit" gorm:"type:varchar(100);comment:鍗曚綅"`
diff --git a/models/yield_register.go b/models/yield_register.go
index c5ec8c7..1163c19 100644
--- a/models/yield_register.go
+++ b/models/yield_register.go
@@ -38,6 +38,10 @@
Total decimal.Decimal `json:"total" gorm:"type:decimal(12,2);comment:鎬讳骇閲�"`
Items []*YieldRegisterItem `json:"items" gorm:"foreignKey:YieldRegisterId"`
Circles []*YieldRegisterCircle `json:"circles" gorm:"foreignKey:YieldRegisterId"`
+
+ MarketName string `json:"marketName" gorm:"-"` //搴勫彛鍚�
+ WorkshopName string `json:"workshopName" gorm:"-"` //杞﹂棿鍚�
+
}
YieldRegisterSearch struct {
YieldRegister
--
Gitblit v1.8.0