From 5c9a0f8184f5e47ea3d8dc8aff5600ae08435a7a Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 29 二月 2024 17:38:49 +0800
Subject: [PATCH] 新增纤度登记及明细
---
go.sum | 2
controllers/fineness.go | 36 +++
models/fineness.go | 18
go.mod | 1
models/db.go | 1
controllers/request/fineness.go | 22 +
docs/swagger.yaml | 87 +++++++
docs/docs.go | 129 ++++++++++
docs/swagger.json | 129 ++++++++++
models/fineness_item.go | 238 +++++++++++++++++++
router/router.go | 1
11 files changed, 655 insertions(+), 9 deletions(-)
diff --git a/controllers/fineness.go b/controllers/fineness.go
index 55428b6..a9068e3 100644
--- a/controllers/fineness.go
+++ b/controllers/fineness.go
@@ -7,10 +7,46 @@
"silkserver/extend/util"
"silkserver/models"
"silkserver/pkg/convertx"
+ "silkserver/pkg/structx"
)
type FinenessController struct{}
+// Add
+// @Tags 绾ゅ害鐧昏
+// @Summary 绾ゅ害鐧昏娣诲姞
+// @Produce application/json
+// @Param object body request.AddFinenessRegister true "瀛楀吀淇℃伅"
+// @Success 200 {object} util.Response "鎴愬姛"
+// @Router /api-jl/v1/fineness/register [post]
+func (slf FinenessController) Add(c *gin.Context) {
+ var reqParams request.AddFinenessRegister
+ var params models.FinenessRegister
+ if err := c.BindJSON(&reqParams); err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�")
+ return
+ }
+ if err := structx.AssignTo(reqParams, ¶ms); err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鏁版嵁杞崲閿欒")
+ return
+ }
+
+ if err := slf.ParamsCheck(params); err != nil {
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
+ if err := models.NewFinenessRegisterSearch().Create(¶ms); err != nil {
+ util.ResponseFormat(c, code.SaveFail, "鎻掑叆澶辫触")
+ return
+ }
+
+ util.ResponseFormat(c, code.Success, "娣诲姞鎴愬姛")
+}
+
+func (slf FinenessController) ParamsCheck(params models.FinenessRegister) (err error) {
+ return nil
+}
+
// List
// @Tags 绾ゅ害鐧昏
// @Summary 绾ゅ害鐧昏鍒楄〃
diff --git a/controllers/request/fineness.go b/controllers/request/fineness.go
index c275204..6005044 100644
--- a/controllers/request/fineness.go
+++ b/controllers/request/fineness.go
@@ -1,5 +1,27 @@
package request
+import "github.com/shopspring/decimal"
+
+type AddFinenessRegister struct {
+ Number string `gorm:"type:varchar(255);not null;comment:缂栧彿" json:"number"` //缂栧彿
+ FinishDate string `gorm:"type:varchar(255);not null;comment:钀戒笣鏃堕棿" json:"finishDate"` //钀戒笣鏃堕棿
+ Workshop string `gorm:"type:varchar(255);not null;comment:杞﹂棿" json:"name"` //杞﹂棿
+ WorkshopGroup string `gorm:"type:varchar(255);not null;comment:杞︾粍" json:"workshopGroup"` //杞︾粍
+ Market string `gorm:"type:varchar(255);not null;comment:搴勫彛" json:"market"` //搴勫彛
+ Spec string `gorm:"type:varchar(255);not null;comment:瑙勬牸" json:"spec"` //瑙勬牸
+ StartCircle uint8 `gorm:"type:varchar(255);not null;comment:寮�濮嬪洖鏁�" json:"startCircle"` //寮�濮嬪洖鏁�
+ EndCircle uint8 `gorm:"type:varchar(255);not null;comment:缁撴潫鍥炴暟" json:"endCircle"` //缁撴潫鍥炴暟
+ FinenessList []FinenessItem `json:"finenessList"`
+ Sum FinenessItem `json:"sum"`
+}
+
+type FinenessItem struct {
+ Position int8 `json:"position"`
+ Fineness decimal.Decimal `json:"fineness"`
+ Quantity decimal.Decimal `json:"quantity"`
+ Sum decimal.Decimal `json:"sum"`
+}
+
type GetFinenessRegisterList struct {
PageInfo
}
diff --git a/docs/docs.go b/docs/docs.go
index c309a2a..33d264f 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -62,6 +62,34 @@
}
}
}
+ },
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "绾ゅ害鐧昏"
+ ],
+ "summary": "绾ゅ害鐧昏娣诲姞",
+ "parameters": [
+ {
+ "description": "瀛楀吀淇℃伅",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.AddFinenessRegister"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
}
},
"/api-jl/v1/fineness/register/{id}": {
@@ -320,6 +348,38 @@
}
}
},
+ "models.FinenessItem": {
+ "type": "object",
+ "properties": {
+ "createdAt": {
+ "type": "string"
+ },
+ "deletedAt": {
+ "$ref": "#/definitions/gorm.DeletedAt"
+ },
+ "fineness": {
+ "type": "number"
+ },
+ "finenessRegisterID": {
+ "type": "integer"
+ },
+ "id": {
+ "type": "integer"
+ },
+ "position": {
+ "type": "integer"
+ },
+ "quantity": {
+ "type": "number"
+ },
+ "sum": {
+ "type": "number"
+ },
+ "updatedAt": {
+ "type": "string"
+ }
+ }
+ },
"models.FinenessRegister": {
"type": "object",
"properties": {
@@ -332,6 +392,12 @@
"endCircle": {
"description": "缁撴潫鍥炴暟",
"type": "integer"
+ },
+ "finenessList": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.FinenessItem"
+ }
},
"finishDate": {
"description": "钀戒笣鏃堕棿",
@@ -394,6 +460,69 @@
}
}
},
+ "request.AddFinenessRegister": {
+ "type": "object",
+ "properties": {
+ "endCircle": {
+ "description": "缁撴潫鍥炴暟",
+ "type": "integer"
+ },
+ "finenessList": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/request.FinenessItem"
+ }
+ },
+ "finishDate": {
+ "description": "钀戒笣鏃堕棿",
+ "type": "string"
+ },
+ "market": {
+ "description": "搴勫彛",
+ "type": "string"
+ },
+ "name": {
+ "description": "杞﹂棿",
+ "type": "string"
+ },
+ "number": {
+ "description": "缂栧彿",
+ "type": "string"
+ },
+ "spec": {
+ "description": "瑙勬牸",
+ "type": "string"
+ },
+ "startCircle": {
+ "description": "寮�濮嬪洖鏁�",
+ "type": "integer"
+ },
+ "sum": {
+ "$ref": "#/definitions/request.FinenessItem"
+ },
+ "workshopGroup": {
+ "description": "杞︾粍",
+ "type": "string"
+ }
+ }
+ },
+ "request.FinenessItem": {
+ "type": "object",
+ "properties": {
+ "fineness": {
+ "type": "number"
+ },
+ "position": {
+ "type": "integer"
+ },
+ "quantity": {
+ "type": "number"
+ },
+ "sum": {
+ "type": "number"
+ }
+ }
+ },
"request.UpdateDict": {
"type": "object",
"properties": {
diff --git a/docs/swagger.json b/docs/swagger.json
index 7c58f0b..a6d7a47 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -50,6 +50,34 @@
}
}
}
+ },
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "绾ゅ害鐧昏"
+ ],
+ "summary": "绾ゅ害鐧昏娣诲姞",
+ "parameters": [
+ {
+ "description": "瀛楀吀淇℃伅",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.AddFinenessRegister"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
}
},
"/api-jl/v1/fineness/register/{id}": {
@@ -308,6 +336,38 @@
}
}
},
+ "models.FinenessItem": {
+ "type": "object",
+ "properties": {
+ "createdAt": {
+ "type": "string"
+ },
+ "deletedAt": {
+ "$ref": "#/definitions/gorm.DeletedAt"
+ },
+ "fineness": {
+ "type": "number"
+ },
+ "finenessRegisterID": {
+ "type": "integer"
+ },
+ "id": {
+ "type": "integer"
+ },
+ "position": {
+ "type": "integer"
+ },
+ "quantity": {
+ "type": "number"
+ },
+ "sum": {
+ "type": "number"
+ },
+ "updatedAt": {
+ "type": "string"
+ }
+ }
+ },
"models.FinenessRegister": {
"type": "object",
"properties": {
@@ -320,6 +380,12 @@
"endCircle": {
"description": "缁撴潫鍥炴暟",
"type": "integer"
+ },
+ "finenessList": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.FinenessItem"
+ }
},
"finishDate": {
"description": "钀戒笣鏃堕棿",
@@ -382,6 +448,69 @@
}
}
},
+ "request.AddFinenessRegister": {
+ "type": "object",
+ "properties": {
+ "endCircle": {
+ "description": "缁撴潫鍥炴暟",
+ "type": "integer"
+ },
+ "finenessList": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/request.FinenessItem"
+ }
+ },
+ "finishDate": {
+ "description": "钀戒笣鏃堕棿",
+ "type": "string"
+ },
+ "market": {
+ "description": "搴勫彛",
+ "type": "string"
+ },
+ "name": {
+ "description": "杞﹂棿",
+ "type": "string"
+ },
+ "number": {
+ "description": "缂栧彿",
+ "type": "string"
+ },
+ "spec": {
+ "description": "瑙勬牸",
+ "type": "string"
+ },
+ "startCircle": {
+ "description": "寮�濮嬪洖鏁�",
+ "type": "integer"
+ },
+ "sum": {
+ "$ref": "#/definitions/request.FinenessItem"
+ },
+ "workshopGroup": {
+ "description": "杞︾粍",
+ "type": "string"
+ }
+ }
+ },
+ "request.FinenessItem": {
+ "type": "object",
+ "properties": {
+ "fineness": {
+ "type": "number"
+ },
+ "position": {
+ "type": "integer"
+ },
+ "quantity": {
+ "type": "number"
+ },
+ "sum": {
+ "type": "number"
+ }
+ }
+ },
"request.UpdateDict": {
"type": "object",
"properties": {
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 0eed71b..24d7128 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -48,6 +48,27 @@
updatedAt:
type: string
type: object
+ models.FinenessItem:
+ properties:
+ createdAt:
+ type: string
+ deletedAt:
+ $ref: '#/definitions/gorm.DeletedAt'
+ fineness:
+ type: number
+ finenessRegisterID:
+ type: integer
+ id:
+ type: integer
+ position:
+ type: integer
+ quantity:
+ type: number
+ sum:
+ type: number
+ updatedAt:
+ type: string
+ type: object
models.FinenessRegister:
properties:
createdAt:
@@ -57,6 +78,10 @@
endCircle:
description: 缁撴潫鍥炴暟
type: integer
+ finenessList:
+ items:
+ $ref: '#/definitions/models.FinenessItem'
+ type: array
finishDate:
description: 钀戒笣鏃堕棿
type: string
@@ -98,6 +123,50 @@
remark:
description: 澶囨敞
type: string
+ type: object
+ request.AddFinenessRegister:
+ properties:
+ endCircle:
+ description: 缁撴潫鍥炴暟
+ type: integer
+ finenessList:
+ items:
+ $ref: '#/definitions/request.FinenessItem'
+ type: array
+ finishDate:
+ description: 钀戒笣鏃堕棿
+ type: string
+ market:
+ description: 搴勫彛
+ type: string
+ name:
+ description: 杞﹂棿
+ type: string
+ number:
+ description: 缂栧彿
+ type: string
+ spec:
+ description: 瑙勬牸
+ type: string
+ startCircle:
+ description: 寮�濮嬪洖鏁�
+ type: integer
+ sum:
+ $ref: '#/definitions/request.FinenessItem'
+ workshopGroup:
+ description: 杞︾粍
+ type: string
+ type: object
+ request.FinenessItem:
+ properties:
+ fineness:
+ type: number
+ position:
+ type: integer
+ quantity:
+ type: number
+ sum:
+ type: number
type: object
request.UpdateDict:
properties:
@@ -170,6 +239,24 @@
summary: 绾ゅ害鐧昏鍒楄〃
tags:
- 绾ゅ害鐧昏
+ post:
+ parameters:
+ - description: 瀛楀吀淇℃伅
+ in: body
+ name: object
+ required: true
+ schema:
+ $ref: '#/definitions/request.AddFinenessRegister'
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ $ref: '#/definitions/util.Response'
+ summary: 绾ゅ害鐧昏娣诲姞
+ tags:
+ - 绾ゅ害鐧昏
/api-jl/v1/fineness/register/{id}:
delete:
parameters:
diff --git a/go.mod b/go.mod
index 50f84b9..df56c1c 100644
--- a/go.mod
+++ b/go.mod
@@ -56,6 +56,7 @@
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
github.com/sagikazarmark/locafero v0.4.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
+ github.com/shopspring/decimal v1.3.1 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
github.com/spf13/afero v1.11.0 // indirect
github.com/spf13/cast v1.6.0 // indirect
diff --git a/go.sum b/go.sum
index e3f7448..fe7b012 100644
--- a/go.sum
+++ b/go.sum
@@ -109,6 +109,8 @@
github.com/sagikazarmark/locafero v0.4.0/go.mod h1:Pe1W6UlPYUk/+wc/6KFhbORCfqzgYEpgQ3O5fPuL3H4=
github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE=
github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ=
+github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8=
+github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo=
github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0=
github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8=
diff --git a/models/db.go b/models/db.go
index 2f49d18..acec2fd 100644
--- a/models/db.go
+++ b/models/db.go
@@ -75,6 +75,7 @@
err := db.AutoMigrate(
Dict{},
FinenessRegister{},
+ FinenessItem{},
)
return err
}
diff --git a/models/fineness.go b/models/fineness.go
index 72dab54..9486840 100644
--- a/models/fineness.go
+++ b/models/fineness.go
@@ -10,16 +10,16 @@
// FinenessRegister 绾ゅ害鐧昏
FinenessRegister struct {
gorm.Model
- Number string `gorm:"type:varchar(255);not null;comment:缂栧彿" json:"number"` //缂栧彿
- FinishDate string `gorm:"type:varchar(255);not null;comment:钀戒笣鏃堕棿" json:"finishDate"` //钀戒笣鏃堕棿
- Workshop string `gorm:"type:varchar(255);not null;comment:杞﹂棿" json:"name"` //杞﹂棿
- WorkshopGroup string `gorm:"type:varchar(255);not null;comment:杞︾粍" json:"workshopGroup"` //杞︾粍
- Market string `gorm:"type:varchar(255);not null;comment:搴勫彛" json:"market"` //搴勫彛
- Spec string `gorm:"type:varchar(255);not null;comment:瑙勬牸" json:"spec"` //瑙勬牸
- StartCircle uint8 `gorm:"type:varchar(255);not null;comment:寮�濮嬪洖鏁�" json:"startCircle"` //寮�濮嬪洖鏁�
- EndCircle uint8 `gorm:"type:varchar(255);not null;comment:缁撴潫鍥炴暟" json:"endCircle"` //缁撴潫鍥炴暟
+ Number string `gorm:"type:varchar(255);not null;comment:缂栧彿" json:"number"` //缂栧彿
+ FinishDate string `gorm:"type:varchar(255);not null;comment:钀戒笣鏃堕棿" json:"finishDate"` //钀戒笣鏃堕棿
+ Workshop string `gorm:"type:varchar(255);not null;comment:杞﹂棿" json:"name"` //杞﹂棿
+ WorkshopGroup string `gorm:"type:varchar(255);not null;comment:杞︾粍" json:"workshopGroup"` //杞︾粍
+ Market string `gorm:"type:varchar(255);not null;comment:搴勫彛" json:"market"` //搴勫彛
+ Spec string `gorm:"type:varchar(255);not null;comment:瑙勬牸" json:"spec"` //瑙勬牸
+ StartCircle uint8 `gorm:"type:varchar(255);not null;comment:寮�濮嬪洖鏁�" json:"startCircle"` //寮�濮嬪洖鏁�
+ EndCircle uint8 `gorm:"type:varchar(255);not null;comment:缁撴潫鍥炴暟" json:"endCircle"` //缁撴潫鍥炴暟
+ FinenessList []FinenessItem `gorm:"foreignkey:FinenessRegisterID" json:"finenessList"`
}
-
FinenessRegisterSearch struct {
FinenessRegister
Order string
diff --git a/models/fineness_item.go b/models/fineness_item.go
new file mode 100644
index 0000000..13995ee
--- /dev/null
+++ b/models/fineness_item.go
@@ -0,0 +1,238 @@
+package models
+
+import (
+ "fmt"
+ "github.com/shopspring/decimal"
+ "gorm.io/gorm"
+ "silkserver/pkg/mysqlx"
+)
+
+type (
+ // FinenessItem 绾ゅ害鐧昏
+ FinenessItem struct {
+ gorm.Model
+ FinenessRegisterID uint `json:"finenessRegisterID"`
+ Position int8 `json:"position"`
+ Fineness decimal.Decimal `json:"fineness"`
+ Quantity decimal.Decimal `json:"quantity"`
+ Sum decimal.Decimal `json:"sum"`
+ }
+
+ FinenessItemSearch struct {
+ FinenessItem
+ Order string
+ PageNum int
+ PageSize int
+ Orm *gorm.DB
+ }
+)
+
+func (slf *FinenessItem) TableName() string {
+ return "fineness_register_item"
+}
+
+func NewFinenessItemSearch() *FinenessItemSearch {
+ return &FinenessItemSearch{Orm: mysqlx.GetDB()}
+}
+
+func (slf *FinenessItemSearch) SetOrm(tx *gorm.DB) *FinenessItemSearch {
+ slf.Orm = tx
+ return slf
+}
+
+func (slf *FinenessItemSearch) SetPage(page, size int) *FinenessItemSearch {
+ slf.PageNum, slf.PageSize = page, size
+ return slf
+}
+
+func (slf *FinenessItemSearch) SetOrder(order string) *FinenessItemSearch {
+ slf.Order = order
+ return slf
+}
+
+func (slf *FinenessItemSearch) SetID(id uint) *FinenessItemSearch {
+ slf.ID = id
+ return slf
+}
+
+func (slf *FinenessItemSearch) build() *gorm.DB {
+ var db = slf.Orm.Table(slf.TableName())
+
+ if slf.ID != 0 {
+ db = db.Where("id = ?", slf.ID)
+ }
+
+ if slf.Order != "" {
+ db = db.Order(slf.Order)
+ }
+
+ return db
+}
+
+// Create 鍗曟潯鎻掑叆
+func (slf *FinenessItemSearch) Create(record *FinenessItem) error {
+ var db = slf.build()
+
+ if err := db.Create(record).Error; err != nil {
+ return fmt.Errorf("create err: %v, record: %+v", err, record)
+ }
+
+ return nil
+}
+
+// CreateBatch 鎵归噺鎻掑叆
+func (slf *FinenessItemSearch) CreateBatch(records []*FinenessItem) error {
+ var db = slf.build()
+
+ if err := db.Create(&records).Error; err != nil {
+ return fmt.Errorf("create batch err: %v, records: %+v", err, records)
+ }
+
+ return nil
+}
+
+func (slf *FinenessItemSearch) Save(record *FinenessItem) error {
+ var db = slf.build()
+
+ if err := db.Omit("CreatedAt").Save(record).Error; err != nil {
+ return fmt.Errorf("save err: %v, record: %+v", err, record)
+ }
+
+ return nil
+}
+
+func (slf *FinenessItemSearch) Update(record *FinenessItem) error {
+ var db = slf.build()
+
+ if err := db.Updates(record).Error; err != nil {
+ return fmt.Errorf("save err: %v, record: %+v", err, record)
+ }
+
+ return nil
+}
+
+func (slf *FinenessItemSearch) UpdateByMap(upMap map[string]interface{}) error {
+ var (
+ db = slf.build()
+ )
+
+ if err := db.Updates(upMap).Error; err != nil {
+ return fmt.Errorf("update by map err: %v, upMap: %+v", err, upMap)
+ }
+
+ return nil
+}
+
+func (slf *FinenessItemSearch) UpdateByQuery(query string, args []interface{}, upMap map[string]interface{}) error {
+ var (
+ db = slf.Orm.Table(slf.TableName()).Where(query, args...)
+ )
+
+ if err := db.Updates(upMap).Error; err != nil {
+ return fmt.Errorf("update by query err: %v, query: %s, args: %+v, upMap: %+v", err, query, args, upMap)
+ }
+
+ return nil
+}
+
+func (slf *FinenessItemSearch) Delete() error {
+ var db = slf.build()
+
+ if err := db.Unscoped().Delete(&FinenessItem{}).Error; err != nil {
+ return err
+ }
+
+ return nil
+}
+
+func (slf *FinenessItemSearch) First() (*FinenessItem, error) {
+ var (
+ record = new(FinenessItem)
+ db = slf.build()
+ )
+
+ if err := db.First(record).Error; err != nil {
+ return record, err
+ }
+
+ return record, nil
+}
+
+func (slf *FinenessItemSearch) Find() ([]*FinenessItem, int64, error) {
+ var (
+ records = make([]*FinenessItem, 0)
+ total int64
+ db = slf.build()
+ )
+
+ if err := db.Count(&total).Error; err != nil {
+ return records, total, fmt.Errorf("find count err: %v", err)
+ }
+ if slf.PageNum*slf.PageSize > 0 {
+ db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize)
+ }
+ if err := db.Find(&records).Error; err != nil {
+ return records, total, fmt.Errorf("find records err: %v", err)
+ }
+
+ return records, total, nil
+}
+
+func (slf *FinenessItemSearch) FindAll() ([]*FinenessItem, error) {
+ var (
+ records = make([]*FinenessItem, 0)
+ db = slf.build()
+ )
+
+ if slf.PageNum*slf.PageSize > 0 {
+ db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize)
+ }
+ if err := db.Find(&records).Error; err != nil {
+ return records, fmt.Errorf("find records err: %v", err)
+ }
+
+ return records, nil
+}
+
+// FindByQuery 鎸囧畾鏉′欢鏌ヨ.
+func (slf *FinenessItemSearch) FindByQuery(query string, args []interface{}) ([]*FinenessItem, int64, error) {
+ var (
+ records = make([]*FinenessItem, 0)
+ total int64
+ db = slf.Orm.Table(slf.TableName()).Where(query, args...)
+ )
+
+ if err := db.Count(&total).Error; err != nil {
+ return records, total, fmt.Errorf("find by query count err: %v", err)
+ }
+ if slf.PageNum*slf.PageSize > 0 {
+ db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize)
+ }
+ if err := db.Find(&records).Error; err != nil {
+ return records, total, fmt.Errorf("find by query records err: %v, query: %s, args: %+v", err, query, args)
+ }
+
+ return records, total, nil
+}
+
+// FindByQueryNotTotal 鎸囧畾鏉′欢鏌ヨ&涓嶆煡璇㈡�绘潯鏁�.
+func (slf *FinenessItemSearch) FindByQueryNotTotal(query string, args []interface{}) ([]*FinenessItem, error) {
+ var (
+ records = make([]*FinenessItem, 0)
+ db = slf.Orm.Table(slf.TableName()).Where(query, args...)
+ )
+
+ if slf.PageNum*slf.PageSize > 0 {
+ db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize)
+ }
+ if err := db.Find(&records).Error; err != nil {
+ return records, fmt.Errorf("find by query records err: %v, query: %s, args: %+v", err, query, args)
+ }
+
+ return records, nil
+}
+
+// InitDefaultData 鍒濆鍖栨暟鎹�
+func (slf *FinenessItemSearch) InitDefaultData() error {
+ return nil
+}
diff --git a/router/router.go b/router/router.go
index 4786f82..4b6f486 100644
--- a/router/router.go
+++ b/router/router.go
@@ -37,6 +37,7 @@
{
finenessApi.GET("register", FinenessController.List) // 鑾峰彇绾ゅ害鐧昏鍒楄〃
finenessApi.DELETE("register/:id", FinenessController.Delete) // 鍒犻櫎绾ゅ害鐧昏
+ finenessApi.POST("register", FinenessController.Add) // 鏂板绾ゅ害鐧昏
}
return r
--
Gitblit v1.8.0