From cdf1e74e60dd3bd214081577f25805ffee921b83 Mon Sep 17 00:00:00 2001
From: yinbentan <yinbentan@live.com>
Date: 星期五, 12 七月 2024 10:15:07 +0800
Subject: [PATCH] 添加代码自动生成，修改获取车辆编号返回结构
---
constvar/const.go | 7
controllers/dict.go | 51 +++
controllers/request/system_set.go | 4
models/fineness.go | 17 +
models/workshop_manage.go | 17 +
docs/swagger.yaml | 197 +++++++++++
docs/docs.go | 306 +++++++++++++++++-
docs/swagger.json | 303 +++++++++++++++++-
controllers/workshop_manage_controller.go | 34 +
router/router.go | 9
10 files changed, 884 insertions(+), 61 deletions(-)
diff --git a/constvar/const.go b/constvar/const.go
index 53a4073..97dccc0 100644
--- a/constvar/const.go
+++ b/constvar/const.go
@@ -17,6 +17,13 @@
UserTypeSub // 瀛愯处鎴�
)
+type CodeStandardType int
+
+const (
+ CodeStandardType_Workshop CodeStandardType = iota + 1
+ CodeStandardType_Fineness
+)
+
type CarFlag int
const (
diff --git a/controllers/dict.go b/controllers/dict.go
index 31f0965..7155392 100644
--- a/controllers/dict.go
+++ b/controllers/dict.go
@@ -5,12 +5,14 @@
"fmt"
"github.com/gin-gonic/gin"
"gorm.io/gorm"
+ "silkserver/constvar"
"silkserver/controllers/request"
"silkserver/extend/code"
"silkserver/extend/util"
"silkserver/models"
"silkserver/pkg/convertx"
"silkserver/pkg/structx"
+ "strconv"
)
type DictController struct{}
@@ -158,3 +160,52 @@
}
util.ResponseFormat(c, code.UpdateSuccess, "鍒犻櫎鎴愬姛")
}
+
+// GetAutoCode
+//
+// @Tags 绯荤粺璁剧疆/瀛楀吀
+// @Summary 鑾峰彇鑷姩缂栫爜
+// @Produce application/json
+// @Param Authorization header string true "token"
+// @Param object query request.CodeStandard true "鏌ヨ鍙傛暟"
+// @Success 200 {object} util.Response{data=map[string]interface{}}
+// @Router /api-jl/v1/system/getAutoCode [get]
+func (slf *DictController) GetAutoCode(c *gin.Context) {
+ var params request.CodeStandard
+ var (
+ id = 0
+ prefix = ""
+ err error
+ )
+ if params.Type, err = strconv.Atoi(c.Query("type")); err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "璇疯緭鍏ユ纭殑绫诲瀷")
+ return
+ }
+ switch constvar.CodeStandardType(params.Type) {
+ case constvar.CodeStandardType_Workshop:
+ id, err = models.NewWorkshopManageSearch().MaxAutoIncr()
+ prefix = "CJ"
+ case constvar.CodeStandardType_Fineness:
+ id, err = models.NewFinenessRegisterSearch().MaxAutoIncr()
+ prefix = "XD"
+ default:
+ util.ResponseFormat(c, code.RequestParamError, "缂栫爜瑙勫垯涓嶅瓨鍦�")
+ return
+ }
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鑾峰彇鏈�澶у�煎け璐�")
+ return
+ }
+ m := make(map[string]interface{})
+
+ strMaxAutoIncr := strconv.Itoa(id + 1)
+ count := 8 - len(strMaxAutoIncr)
+ for i := 0; i < count; i++ {
+ strMaxAutoIncr = "0" + strMaxAutoIncr
+ }
+
+ m["id"] = prefix + strMaxAutoIncr
+ m["codeStandardID"] = constvar.CodeStandardType_Fineness
+ m["maxAutoIncr"] = id + 1
+ util.ResponseFormat(c, code.Success, m)
+}
diff --git a/controllers/request/system_set.go b/controllers/request/system_set.go
index f7db82b..f4622e0 100644
--- a/controllers/request/system_set.go
+++ b/controllers/request/system_set.go
@@ -23,6 +23,10 @@
AddDict
}
+type CodeStandard struct {
+ Type int `json:"type"` // 绫诲瀷
+}
+
// ---------------------------------------鐢熶笣---------------------------------
type GetPriceStandard struct {
PageInfo
diff --git a/controllers/workshop_manage_controller.go b/controllers/workshop_manage_controller.go
index 50109a7..c68422b 100644
--- a/controllers/workshop_manage_controller.go
+++ b/controllers/workshop_manage_controller.go
@@ -245,20 +245,42 @@
return
}
all, err := models.NewWorkshopManageSearch().
- SetType(constvar.Group).SetWorkshopName(params.WorkshopName).SetGroupNumber(params.GroupNumber).
+ SetType(constvar.Group).SetWorkshopNumber(params.WorkshopNumber).SetWorkshopName(params.WorkshopName).SetGroupNumber(params.GroupNumber).
SetOrder("workshop_number,group_number,start_car_number").FindNotTotal()
if err != nil {
util.ResponseFormat(c, code.RequestParamError, "鏌ユ壘澶辫触")
return
}
- carNumbers := make([]int, 0)
+ //carNumbers := make([]int, 0)
+ var (
+ startCarNumber = 0
+ endCarNumber = 0
+ startCarHalf = constvar.LeftHalfCar
+ endCarHalf = constvar.RightHalfCar
+ )
for _, manage := range all {
- i := manage.StartCarNumber
- for ; i <= manage.EndCarNumber; i++ {
- carNumbers = append(carNumbers, i)
+ if startCarNumber == 0 {
+ startCarNumber = manage.StartCarNumber
+ startCarHalf = manage.StartCarHalf
+ endCarNumber = manage.EndCarNumber
+ endCarHalf = manage.EndCarHalf
+ continue
+ }
+ if manage.StartCarNumber < startCarNumber {
+ startCarNumber = manage.StartCarNumber
+ startCarHalf = manage.StartCarHalf
+ }
+ if manage.EndCarNumber > endCarNumber {
+ endCarNumber = manage.EndCarNumber
+ endCarHalf = manage.EndCarHalf
}
}
- util.ResponseFormat(c, code.Success, carNumbers)
+ m := make(map[string]interface{})
+ m["startCarNumber"] = startCarNumber
+ m["startCarHalf"] = startCarHalf
+ m["endCarNumber"] = endCarNumber
+ m["endCarHalf"] = endCarHalf
+ util.ResponseFormat(c, code.Success, m)
}
// GetWorkshopManageGroup
diff --git a/docs/docs.go b/docs/docs.go
index e1824a3..d5e5cd8 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -1,5 +1,4 @@
-// Code generated by swaggo/swag. DO NOT EDIT.
-
+// Package docs Code generated by swaggo/swag. DO NOT EDIT
package docs
import "github.com/swaggo/swag"
@@ -808,7 +807,7 @@
"tags": [
"鎶ヨ〃绠＄悊"
],
- "summary": "钖祫鎶ヨ〃",
+ "summary": "鑾峰彇钖祫鎶ヨ〃",
"parameters": [
{
"description": "鍙傛暟",
@@ -847,6 +846,43 @@
}
}
]
+ }
+ }
+ }
+ }
+ },
+ "/api-jl/v1/forms/updateSalaryReportForms": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鎶ヨ〃绠＄悊"
+ ],
+ "summary": "淇敼钖祫鎶ヨ〃",
+ "parameters": [
+ {
+ "description": "鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.UpdateSalaryReportForms"
+ }
+ },
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
}
}
}
@@ -1442,6 +1478,53 @@
}
}
},
+ "/api-jl/v1/system/getAutoCode": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "绯荤粺璁剧疆/瀛楀吀"
+ ],
+ "summary": "鑾峰彇鑷姩缂栫爜",
+ "parameters": [
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ },
+ {
+ "type": "integer",
+ "description": "绫诲瀷",
+ "name": "type",
+ "in": "query"
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "OK",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/util.Response"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "type": "object",
+ "additionalProperties": true
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
"/api-jl/v1/system/getCarAndLevel": {
"post": {
"produces": [
@@ -1763,7 +1846,7 @@
"data": {
"type": "array",
"items": {
- "$ref": "#/definitions/models.WorkshopManage"
+ "$ref": "#/definitions/response.WorkshopManage"
}
}
}
@@ -1845,20 +1928,20 @@
"summary": "淇濆瓨杞﹂棿绠＄悊",
"parameters": [
{
- "description": "鍙傛暟",
- "name": "object",
- "in": "body",
- "required": true,
- "schema": {
- "$ref": "#/definitions/models.WorkshopManage"
- }
- },
- {
"type": "string",
"description": "token",
"name": "Authorization",
"in": "header",
"required": true
+ },
+ {
+ "description": "鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.AddWorkshopManage"
+ }
}
],
"responses": {
@@ -2344,18 +2427,15 @@
"type": "integer",
"enum": [
1,
- 2,
- 3
+ 2
],
"x-enum-comments": {
- "AllCar": "鍏ㄨ溅缁撴潫",
"LeftHalfCar": "宸﹀崐杞�",
"RightHalfCar": "鍙冲崐杞�"
},
"x-enum-varnames": [
"LeftHalfCar",
- "RightHalfCar",
- "AllCar"
+ "RightHalfCar"
]
},
"constvar.CheckItem": {
@@ -2476,6 +2556,21 @@
"WorkerStatusRest",
"WorkerStatusHoliday",
"WorkerStatusOvertime"
+ ]
+ },
+ "constvar.WorkshopType": {
+ "type": "integer",
+ "enum": [
+ 1,
+ 2
+ ],
+ "x-enum-comments": {
+ "Group": "鍒嗙粍淇℃伅",
+ "Workshop": "杞﹂棿淇℃伅"
+ },
+ "x-enum-varnames": [
+ "Workshop",
+ "Group"
]
},
"gorm.DeletedAt": {
@@ -2818,7 +2913,11 @@
"type": "integer"
},
"market": {
- "description": "搴勫彛",
+ "description": "搴勫彛鍚嶇О",
+ "type": "string"
+ },
+ "marketNumber": {
+ "description": "搴勫彛缂栧彿",
"type": "string"
},
"number": {
@@ -2851,9 +2950,11 @@
"type": "integer"
},
"workshopName": {
+ "description": "杞﹂棿鍚嶇О",
"type": "string"
},
"workshopNumber": {
+ "description": "杞﹂棿缂栧彿",
"type": "string"
}
}
@@ -3055,6 +3156,9 @@
"addPeople": {
"type": "string"
},
+ "deletedAt": {
+ "$ref": "#/definitions/gorm.DeletedAt"
+ },
"employmentTime": {
"type": "string"
},
@@ -3151,13 +3255,16 @@
"type": "object",
"properties": {
"carFlag": {
- "$ref": "#/definitions/constvar.CarFlag"
+ "type": "integer"
},
"createdAt": {
"type": "string"
},
"deletedAt": {
"$ref": "#/definitions/gorm.DeletedAt"
+ },
+ "endCarHalf": {
+ "$ref": "#/definitions/constvar.CarFlag"
},
"endCarNumber": {
"type": "integer"
@@ -3171,8 +3278,22 @@
"notes": {
"type": "string"
},
+ "parentID": {
+ "type": "string"
+ },
+ "startCarHalf": {
+ "$ref": "#/definitions/constvar.CarFlag"
+ },
"startCarNumber": {
"type": "integer"
+ },
+ "type": {
+ "description": "绫诲瀷(1杞﹂棿銆�2鍒嗙粍)",
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.WorkshopType"
+ }
+ ]
},
"updatedAt": {
"type": "string"
@@ -3533,6 +3654,68 @@
}
}
},
+ "request.AddWorkshopManage": {
+ "type": "object",
+ "properties": {
+ "carFlag": {
+ "type": "integer"
+ },
+ "createdAt": {
+ "type": "string"
+ },
+ "deletedAt": {
+ "$ref": "#/definitions/gorm.DeletedAt"
+ },
+ "details": {
+ "description": "杞﹂棿淇℃伅",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.WorkshopManage"
+ }
+ },
+ "endCarHalf": {
+ "$ref": "#/definitions/constvar.CarFlag"
+ },
+ "endCarNumber": {
+ "type": "integer"
+ },
+ "groupNumber": {
+ "type": "integer"
+ },
+ "id": {
+ "type": "integer"
+ },
+ "notes": {
+ "type": "string"
+ },
+ "parentID": {
+ "type": "string"
+ },
+ "startCarHalf": {
+ "$ref": "#/definitions/constvar.CarFlag"
+ },
+ "startCarNumber": {
+ "type": "integer"
+ },
+ "type": {
+ "description": "绫诲瀷(1杞﹂棿銆�2鍒嗙粍)",
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.WorkshopType"
+ }
+ ]
+ },
+ "updatedAt": {
+ "type": "string"
+ },
+ "workshopName": {
+ "type": "string"
+ },
+ "workshopNumber": {
+ "type": "string"
+ }
+ }
+ },
"request.ChangeYieldRegister": {
"type": "object",
"properties": {
@@ -3729,6 +3912,10 @@
},
"workshopName": {
"description": "杞﹂棿鍚嶇О",
+ "type": "string"
+ },
+ "workshopNumber": {
+ "description": "杞﹂棿缂栧彿",
"type": "string"
}
}
@@ -3977,6 +4164,23 @@
},
"workerId": {
"description": "宸ヤ汉ID",
+ "type": "string"
+ }
+ }
+ },
+ "request.UpdateSalaryReportForms": {
+ "type": "object",
+ "properties": {
+ "amount": {
+ "type": "number"
+ },
+ "month": {
+ "type": "string"
+ },
+ "salaryTypeId": {
+ "type": "integer"
+ },
+ "workerId": {
"type": "string"
}
}
@@ -4468,6 +4672,68 @@
}
}
},
+ "response.WorkshopManage": {
+ "type": "object",
+ "properties": {
+ "carFlag": {
+ "type": "integer"
+ },
+ "createdAt": {
+ "type": "string"
+ },
+ "deletedAt": {
+ "$ref": "#/definitions/gorm.DeletedAt"
+ },
+ "details": {
+ "description": "杞﹂棿淇℃伅",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.WorkshopManage"
+ }
+ },
+ "endCarHalf": {
+ "$ref": "#/definitions/constvar.CarFlag"
+ },
+ "endCarNumber": {
+ "type": "integer"
+ },
+ "groupNumber": {
+ "type": "integer"
+ },
+ "id": {
+ "type": "integer"
+ },
+ "notes": {
+ "type": "string"
+ },
+ "parentID": {
+ "type": "string"
+ },
+ "startCarHalf": {
+ "$ref": "#/definitions/constvar.CarFlag"
+ },
+ "startCarNumber": {
+ "type": "integer"
+ },
+ "type": {
+ "description": "绫诲瀷(1杞﹂棿銆�2鍒嗙粍)",
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.WorkshopType"
+ }
+ ]
+ },
+ "updatedAt": {
+ "type": "string"
+ },
+ "workshopName": {
+ "type": "string"
+ },
+ "workshopNumber": {
+ "type": "string"
+ }
+ }
+ },
"util.Response": {
"type": "object",
"properties": {
diff --git a/docs/swagger.json b/docs/swagger.json
index 4fd364b..6237fc6 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -796,7 +796,7 @@
"tags": [
"鎶ヨ〃绠＄悊"
],
- "summary": "钖祫鎶ヨ〃",
+ "summary": "鑾峰彇钖祫鎶ヨ〃",
"parameters": [
{
"description": "鍙傛暟",
@@ -835,6 +835,43 @@
}
}
]
+ }
+ }
+ }
+ }
+ },
+ "/api-jl/v1/forms/updateSalaryReportForms": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鎶ヨ〃绠＄悊"
+ ],
+ "summary": "淇敼钖祫鎶ヨ〃",
+ "parameters": [
+ {
+ "description": "鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.UpdateSalaryReportForms"
+ }
+ },
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
}
}
}
@@ -1430,6 +1467,53 @@
}
}
},
+ "/api-jl/v1/system/getAutoCode": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "绯荤粺璁剧疆/瀛楀吀"
+ ],
+ "summary": "鑾峰彇鑷姩缂栫爜",
+ "parameters": [
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ },
+ {
+ "type": "integer",
+ "description": "绫诲瀷",
+ "name": "type",
+ "in": "query"
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "OK",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/util.Response"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "type": "object",
+ "additionalProperties": true
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
"/api-jl/v1/system/getCarAndLevel": {
"post": {
"produces": [
@@ -1751,7 +1835,7 @@
"data": {
"type": "array",
"items": {
- "$ref": "#/definitions/models.WorkshopManage"
+ "$ref": "#/definitions/response.WorkshopManage"
}
}
}
@@ -1833,20 +1917,20 @@
"summary": "淇濆瓨杞﹂棿绠＄悊",
"parameters": [
{
- "description": "鍙傛暟",
- "name": "object",
- "in": "body",
- "required": true,
- "schema": {
- "$ref": "#/definitions/models.WorkshopManage"
- }
- },
- {
"type": "string",
"description": "token",
"name": "Authorization",
"in": "header",
"required": true
+ },
+ {
+ "description": "鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.AddWorkshopManage"
+ }
}
],
"responses": {
@@ -2332,18 +2416,15 @@
"type": "integer",
"enum": [
1,
- 2,
- 3
+ 2
],
"x-enum-comments": {
- "AllCar": "鍏ㄨ溅缁撴潫",
"LeftHalfCar": "宸﹀崐杞�",
"RightHalfCar": "鍙冲崐杞�"
},
"x-enum-varnames": [
"LeftHalfCar",
- "RightHalfCar",
- "AllCar"
+ "RightHalfCar"
]
},
"constvar.CheckItem": {
@@ -2464,6 +2545,21 @@
"WorkerStatusRest",
"WorkerStatusHoliday",
"WorkerStatusOvertime"
+ ]
+ },
+ "constvar.WorkshopType": {
+ "type": "integer",
+ "enum": [
+ 1,
+ 2
+ ],
+ "x-enum-comments": {
+ "Group": "鍒嗙粍淇℃伅",
+ "Workshop": "杞﹂棿淇℃伅"
+ },
+ "x-enum-varnames": [
+ "Workshop",
+ "Group"
]
},
"gorm.DeletedAt": {
@@ -2806,7 +2902,11 @@
"type": "integer"
},
"market": {
- "description": "搴勫彛",
+ "description": "搴勫彛鍚嶇О",
+ "type": "string"
+ },
+ "marketNumber": {
+ "description": "搴勫彛缂栧彿",
"type": "string"
},
"number": {
@@ -2839,9 +2939,11 @@
"type": "integer"
},
"workshopName": {
+ "description": "杞﹂棿鍚嶇О",
"type": "string"
},
"workshopNumber": {
+ "description": "杞﹂棿缂栧彿",
"type": "string"
}
}
@@ -3043,6 +3145,9 @@
"addPeople": {
"type": "string"
},
+ "deletedAt": {
+ "$ref": "#/definitions/gorm.DeletedAt"
+ },
"employmentTime": {
"type": "string"
},
@@ -3139,13 +3244,16 @@
"type": "object",
"properties": {
"carFlag": {
- "$ref": "#/definitions/constvar.CarFlag"
+ "type": "integer"
},
"createdAt": {
"type": "string"
},
"deletedAt": {
"$ref": "#/definitions/gorm.DeletedAt"
+ },
+ "endCarHalf": {
+ "$ref": "#/definitions/constvar.CarFlag"
},
"endCarNumber": {
"type": "integer"
@@ -3159,8 +3267,22 @@
"notes": {
"type": "string"
},
+ "parentID": {
+ "type": "string"
+ },
+ "startCarHalf": {
+ "$ref": "#/definitions/constvar.CarFlag"
+ },
"startCarNumber": {
"type": "integer"
+ },
+ "type": {
+ "description": "绫诲瀷(1杞﹂棿銆�2鍒嗙粍)",
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.WorkshopType"
+ }
+ ]
},
"updatedAt": {
"type": "string"
@@ -3521,6 +3643,68 @@
}
}
},
+ "request.AddWorkshopManage": {
+ "type": "object",
+ "properties": {
+ "carFlag": {
+ "type": "integer"
+ },
+ "createdAt": {
+ "type": "string"
+ },
+ "deletedAt": {
+ "$ref": "#/definitions/gorm.DeletedAt"
+ },
+ "details": {
+ "description": "杞﹂棿淇℃伅",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.WorkshopManage"
+ }
+ },
+ "endCarHalf": {
+ "$ref": "#/definitions/constvar.CarFlag"
+ },
+ "endCarNumber": {
+ "type": "integer"
+ },
+ "groupNumber": {
+ "type": "integer"
+ },
+ "id": {
+ "type": "integer"
+ },
+ "notes": {
+ "type": "string"
+ },
+ "parentID": {
+ "type": "string"
+ },
+ "startCarHalf": {
+ "$ref": "#/definitions/constvar.CarFlag"
+ },
+ "startCarNumber": {
+ "type": "integer"
+ },
+ "type": {
+ "description": "绫诲瀷(1杞﹂棿銆�2鍒嗙粍)",
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.WorkshopType"
+ }
+ ]
+ },
+ "updatedAt": {
+ "type": "string"
+ },
+ "workshopName": {
+ "type": "string"
+ },
+ "workshopNumber": {
+ "type": "string"
+ }
+ }
+ },
"request.ChangeYieldRegister": {
"type": "object",
"properties": {
@@ -3717,6 +3901,10 @@
},
"workshopName": {
"description": "杞﹂棿鍚嶇О",
+ "type": "string"
+ },
+ "workshopNumber": {
+ "description": "杞﹂棿缂栧彿",
"type": "string"
}
}
@@ -3965,6 +4153,23 @@
},
"workerId": {
"description": "宸ヤ汉ID",
+ "type": "string"
+ }
+ }
+ },
+ "request.UpdateSalaryReportForms": {
+ "type": "object",
+ "properties": {
+ "amount": {
+ "type": "number"
+ },
+ "month": {
+ "type": "string"
+ },
+ "salaryTypeId": {
+ "type": "integer"
+ },
+ "workerId": {
"type": "string"
}
}
@@ -4456,6 +4661,68 @@
}
}
},
+ "response.WorkshopManage": {
+ "type": "object",
+ "properties": {
+ "carFlag": {
+ "type": "integer"
+ },
+ "createdAt": {
+ "type": "string"
+ },
+ "deletedAt": {
+ "$ref": "#/definitions/gorm.DeletedAt"
+ },
+ "details": {
+ "description": "杞﹂棿淇℃伅",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.WorkshopManage"
+ }
+ },
+ "endCarHalf": {
+ "$ref": "#/definitions/constvar.CarFlag"
+ },
+ "endCarNumber": {
+ "type": "integer"
+ },
+ "groupNumber": {
+ "type": "integer"
+ },
+ "id": {
+ "type": "integer"
+ },
+ "notes": {
+ "type": "string"
+ },
+ "parentID": {
+ "type": "string"
+ },
+ "startCarHalf": {
+ "$ref": "#/definitions/constvar.CarFlag"
+ },
+ "startCarNumber": {
+ "type": "integer"
+ },
+ "type": {
+ "description": "绫诲瀷(1杞﹂棿銆�2鍒嗙粍)",
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.WorkshopType"
+ }
+ ]
+ },
+ "updatedAt": {
+ "type": "string"
+ },
+ "workshopName": {
+ "type": "string"
+ },
+ "workshopNumber": {
+ "type": "string"
+ }
+ }
+ },
"util.Response": {
"type": "object",
"properties": {
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index da4f0f1..d383d84 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -20,16 +20,13 @@
enum:
- 1
- 2
- - 3
type: integer
x-enum-comments:
- AllCar: 鍏ㄨ溅缁撴潫
LeftHalfCar: 宸﹀崐杞�
RightHalfCar: 鍙冲崐杞�
x-enum-varnames:
- LeftHalfCar
- RightHalfCar
- - AllCar
constvar.CheckItem:
enum:
- 1
@@ -130,6 +127,17 @@
- WorkerStatusRest
- WorkerStatusHoliday
- WorkerStatusOvertime
+ constvar.WorkshopType:
+ enum:
+ - 1
+ - 2
+ type: integer
+ x-enum-comments:
+ Group: 鍒嗙粍淇℃伅
+ Workshop: 杞﹂棿淇℃伅
+ x-enum-varnames:
+ - Workshop
+ - Group
gorm.DeletedAt:
properties:
time:
@@ -363,7 +371,10 @@
id:
type: integer
market:
- description: 搴勫彛
+ description: 搴勫彛鍚嶇О
+ type: string
+ marketNumber:
+ description: 搴勫彛缂栧彿
type: string
number:
description: 缂栧彿
@@ -387,8 +398,10 @@
description: 杞︾粍
type: integer
workshopName:
+ description: 杞﹂棿鍚嶇О
type: string
workshopNumber:
+ description: 杞﹂棿缂栧彿
type: string
type: object
models.FinenessRoundingItem:
@@ -521,6 +534,8 @@
properties:
addPeople:
type: string
+ deletedAt:
+ $ref: '#/definitions/gorm.DeletedAt'
employmentTime:
type: string
groupNumber:
@@ -586,11 +601,13 @@
models.WorkshopManage:
properties:
carFlag:
- $ref: '#/definitions/constvar.CarFlag'
+ type: integer
createdAt:
type: string
deletedAt:
$ref: '#/definitions/gorm.DeletedAt'
+ endCarHalf:
+ $ref: '#/definitions/constvar.CarFlag'
endCarNumber:
type: integer
groupNumber:
@@ -599,8 +616,16 @@
type: integer
notes:
type: string
+ parentID:
+ type: string
+ startCarHalf:
+ $ref: '#/definitions/constvar.CarFlag'
startCarNumber:
type: integer
+ type:
+ allOf:
+ - $ref: '#/definitions/constvar.WorkshopType'
+ description: 绫诲瀷(1杞﹂棿銆�2鍒嗙粍)
updatedAt:
type: string
workshopName:
@@ -848,6 +873,46 @@
- workshopGroup
- workshopName
type: object
+ request.AddWorkshopManage:
+ properties:
+ carFlag:
+ type: integer
+ createdAt:
+ type: string
+ deletedAt:
+ $ref: '#/definitions/gorm.DeletedAt'
+ details:
+ description: 杞﹂棿淇℃伅
+ items:
+ $ref: '#/definitions/models.WorkshopManage'
+ type: array
+ endCarHalf:
+ $ref: '#/definitions/constvar.CarFlag'
+ endCarNumber:
+ type: integer
+ groupNumber:
+ type: integer
+ id:
+ type: integer
+ notes:
+ type: string
+ parentID:
+ type: string
+ startCarHalf:
+ $ref: '#/definitions/constvar.CarFlag'
+ startCarNumber:
+ type: integer
+ type:
+ allOf:
+ - $ref: '#/definitions/constvar.WorkshopType'
+ description: 绫诲瀷(1杞﹂棿銆�2鍒嗙粍)
+ updatedAt:
+ type: string
+ workshopName:
+ type: string
+ workshopNumber:
+ type: string
+ type: object
request.ChangeYieldRegister:
properties:
createTime:
@@ -985,6 +1050,9 @@
type: string
workshopName:
description: 杞﹂棿鍚嶇О
+ type: string
+ workshopNumber:
+ description: 杞﹂棿缂栧彿
type: string
type: object
request.GetYieldRegisterList:
@@ -1151,6 +1219,17 @@
type: string
workerId:
description: 宸ヤ汉ID
+ type: string
+ type: object
+ request.UpdateSalaryReportForms:
+ properties:
+ amount:
+ type: number
+ month:
+ type: string
+ salaryTypeId:
+ type: integer
+ workerId:
type: string
type: object
request.UpdateWorkerPositionRequest:
@@ -1498,6 +1577,46 @@
workerId:
type: string
workerName:
+ type: string
+ type: object
+ response.WorkshopManage:
+ properties:
+ carFlag:
+ type: integer
+ createdAt:
+ type: string
+ deletedAt:
+ $ref: '#/definitions/gorm.DeletedAt'
+ details:
+ description: 杞﹂棿淇℃伅
+ items:
+ $ref: '#/definitions/models.WorkshopManage'
+ type: array
+ endCarHalf:
+ $ref: '#/definitions/constvar.CarFlag'
+ endCarNumber:
+ type: integer
+ groupNumber:
+ type: integer
+ id:
+ type: integer
+ notes:
+ type: string
+ parentID:
+ type: string
+ startCarHalf:
+ $ref: '#/definitions/constvar.CarFlag'
+ startCarNumber:
+ type: integer
+ type:
+ allOf:
+ - $ref: '#/definitions/constvar.WorkshopType'
+ description: 绫诲瀷(1杞﹂棿銆�2鍒嗙粍)
+ updatedAt:
+ type: string
+ workshopName:
+ type: string
+ workshopNumber:
type: string
type: object
util.Response:
@@ -2032,7 +2151,31 @@
$ref: '#/definitions/response.SalaryReportForms'
type: array
type: object
- summary: 钖祫鎶ヨ〃
+ summary: 鑾峰彇钖祫鎶ヨ〃
+ tags:
+ - 鎶ヨ〃绠＄悊
+ /api-jl/v1/forms/updateSalaryReportForms:
+ post:
+ parameters:
+ - description: 鍙傛暟
+ in: body
+ name: object
+ required: true
+ schema:
+ $ref: '#/definitions/request.UpdateSalaryReportForms'
+ - description: token
+ in: header
+ name: Authorization
+ required: true
+ type: string
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ $ref: '#/definitions/util.Response'
+ summary: 淇敼钖祫鎶ヨ〃
tags:
- 鎶ヨ〃绠＄悊
/api-jl/v1/mentor/createMentorInfo:
@@ -2410,6 +2553,34 @@
summary: 鍒犻櫎瀛楀吀
tags:
- 绯荤粺璁剧疆/瀛楀吀
+ /api-jl/v1/system/getAutoCode:
+ get:
+ parameters:
+ - description: token
+ in: header
+ name: Authorization
+ required: true
+ type: string
+ - description: 绫诲瀷
+ in: query
+ name: type
+ type: integer
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: OK
+ schema:
+ allOf:
+ - $ref: '#/definitions/util.Response'
+ - properties:
+ data:
+ additionalProperties: true
+ type: object
+ type: object
+ summary: 鑾峰彇鑷姩缂栫爜
+ tags:
+ - 绯荤粺璁剧疆/瀛楀吀
/api-jl/v1/system/getCarAndLevel:
post:
parameters:
@@ -2599,7 +2770,7 @@
- properties:
data:
items:
- $ref: '#/definitions/models.WorkshopManage'
+ $ref: '#/definitions/response.WorkshopManage'
type: array
type: object
summary: 鑾峰彇杞﹂棿绠＄悊鍒楄〃
@@ -2646,17 +2817,17 @@
/api-jl/v1/system/saveWorkshopManage:
post:
parameters:
- - description: 鍙傛暟
- in: body
- name: object
- required: true
- schema:
- $ref: '#/definitions/models.WorkshopManage'
- description: token
in: header
name: Authorization
required: true
type: string
+ - description: 鍙傛暟
+ in: body
+ name: object
+ required: true
+ schema:
+ $ref: '#/definitions/request.AddWorkshopManage'
produces:
- application/json
responses:
diff --git a/models/fineness.go b/models/fineness.go
index 3d6ea97..3fedf1a 100644
--- a/models/fineness.go
+++ b/models/fineness.go
@@ -306,6 +306,23 @@
return records, nil
}
+func (slf *FinenessRegisterSearch) MaxAutoIncr() (int, error) {
+ type Result struct {
+ Max int
+ }
+
+ var (
+ result Result
+ db = slf.build()
+ )
+
+ err := db.Select("MAX(id) as max").Scan(&result).Error
+ if err != nil {
+ return result.Max, fmt.Errorf("max err: %v", err)
+ }
+ return result.Max, nil
+}
+
// InitDefaultData 鍒濆鍖栨暟鎹�
func (slf *FinenessRegisterSearch) InitDefaultData() error {
return nil
diff --git a/models/workshop_manage.go b/models/workshop_manage.go
index 88c555f..df3e9b6 100644
--- a/models/workshop_manage.go
+++ b/models/workshop_manage.go
@@ -226,3 +226,20 @@
}
return total, nil
}
+
+func (slf *WorkshopManageSearch) MaxAutoIncr() (int, error) {
+ type Result struct {
+ Max int
+ }
+
+ var (
+ result Result
+ db = slf.build()
+ )
+
+ err := db.Select("MAX(id) as max").Scan(&result).Error
+ if err != nil {
+ return result.Max, fmt.Errorf("max err: %v", err)
+ }
+ return result.Max, nil
+}
diff --git a/router/router.go b/router/router.go
index db4e582..e639d88 100644
--- a/router/router.go
+++ b/router/router.go
@@ -33,10 +33,11 @@
systemApi := r.Group(urlPrefix + "/system")
{
//璇嶅吀绠＄悊
- systemApi.GET("dict", DictController.List) // 鑾峰彇璇嶅吀鍒楄〃
- systemApi.POST("dict", DictController.Add) // 鏂板璇嶅吀
- systemApi.PUT("dict", DictController.Update) // 淇敼璇嶅吀
- systemApi.DELETE("dict/:id", DictController.Delete) // 鍒犻櫎璇嶅吀
+ systemApi.GET("dict", DictController.List) // 鑾峰彇璇嶅吀鍒楄〃
+ systemApi.POST("dict", DictController.Add) // 鏂板璇嶅吀
+ systemApi.PUT("dict", DictController.Update) // 淇敼璇嶅吀
+ systemApi.DELETE("dict/:id", DictController.Delete) // 鍒犻櫎璇嶅吀
+ systemApi.GET("getAutoCode", DictController.GetAutoCode) // 鑾峰彇鑷姩缂栫爜
// 鐢熶笣绠＄悊
systemApi.GET("getPriceStandardList", rawSilkController.GetPriceStandardList) //鑾峰彇鐢熶笣瀹氫环鏍囧噯
systemApi.POST("savePriceStandard", rawSilkController.SavePriceStandard) //淇濆瓨鐢熶笣瀹氫环鏍囧噯
--
Gitblit v1.8.0