From 632bef19cd6229014644e4394d43e95c6707d773 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 22 四月 2024 11:49:36 +0800
Subject: [PATCH] 机台信息增删改查接口
---
controllers/worker_position_controller.go | 156 ++++++
controllers/request/worker_request.go | 20
models/mentor.go | 2
models/db.go | 1
models/worker_position.go | 288 ++++++++++++
docs/swagger.yaml | 219 +++++++++
docs/docs.go | 322 +++++++++++++
docs/swagger.json | 322 +++++++++++++
router/router.go | 9
9 files changed, 1,335 insertions(+), 4 deletions(-)
diff --git a/controllers/request/worker_request.go b/controllers/request/worker_request.go
index 1978712..66ef393 100644
--- a/controllers/request/worker_request.go
+++ b/controllers/request/worker_request.go
@@ -26,3 +26,23 @@
Name string `json:"name"` //鍚嶇О
IsDefault bool `json:"isDefault"` //鏄惁鍙紪杈�
}
+
+type AddWorkPositionRequest struct {
+ StartDate string `gorm:"type:varchar(255);not null;default:'';comment:寮�濮嬫棩鏈�" validate:"required"` //寮�濮嬫棩鏈�
+ EndDate string `gorm:"type:varchar(255);not null;default:'';comment:缁撴潫鏃ユ湡" validate:"required"` //缁撴潫鏃ユ湡
+ Workshop string `gorm:"type:varchar(255);not null;comment:杞﹂棿" json:"workshop" validate:"required"` //杞﹂棿
+ WorkshopGroup int `gorm:"type:int(11);not null;default:0;comment:杞︾粍" json:"workshopGroup" validate:"required"` //杞︾粍
+ StartWorkerPosition int `json:"startWorkerPosition" gorm:"type:int(11);comment:寮�濮嬭溅鍙�" validate:"required"` //寮�濮嬭溅鍙�
+ EndWorkerPosition int `json:"endWorkerPosition" gorm:"type:int(11);comment:缁撴潫杞﹀彿" validate:"required"` //缁撴潫杞﹀彿
+ WorkerId string `gorm:"type:varchar(255);not null;default:'';comment:宸ヤ汉ID" json:"workerId" validate:"required"` //宸ヤ汉ID
+}
+
+type UpdateWorkerPositionRequest struct {
+ Id uint `json:"id"`
+ AddWorkPositionRequest
+}
+
+type GetWorkerPositionList struct {
+ PageInfo
+ Keyword string `json:"keyword"`
+}
diff --git a/controllers/worker_position_controller.go b/controllers/worker_position_controller.go
new file mode 100644
index 0000000..ad675f1
--- /dev/null
+++ b/controllers/worker_position_controller.go
@@ -0,0 +1,156 @@
+package controllers
+
+import (
+ "github.com/gin-gonic/gin"
+ "github.com/spf13/cast"
+ "gorm.io/gorm"
+ "silkserver/controllers/request"
+ "silkserver/extend/code"
+ "silkserver/extend/util"
+ "silkserver/middleware"
+ "silkserver/models"
+)
+
+type WorkerPositionController struct {
+}
+
+// CreateWorkerPositionInfo
+// @Tags 鏈哄彴绠＄悊
+// @Summary 鍒涘缓鏈哄彴淇℃伅
+// @Produce application/json
+// @Param object body request.AddWorkPositionRequest true "鍙傛暟"
+// @Param Authorization header string true "token"
+// @Success 200 {object} util.Response "鎴愬姛"
+// @Router /api-jl/v1/workerPosition/createWorkerPositionInfo [post]
+func (slf WorkerPositionController) CreateWorkerPositionInfo(c *gin.Context) {
+ var params request.AddWorkPositionRequest
+ err := c.BindJSON(¶ms)
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�")
+ return
+ }
+
+ //鏌ヨ鏄惁閲嶅
+ _, err = models.NewWorkerPositionSearch().SetWorkerID(params.WorkerId).First()
+ if err != gorm.ErrRecordNotFound {
+ util.ResponseFormat(c, code.RequestParamError, "璇峰嬁閲嶅娣诲姞")
+ return
+ }
+
+ record := &models.WorkerPosition{
+ StartDate: params.StartDate,
+ EndDate: params.EndDate,
+ Workshop: params.Workshop,
+ WorkshopGroup: params.WorkshopGroup,
+ StartWorkerPosition: params.StartWorkerPosition,
+ EndWorkerPosition: params.EndWorkerPosition,
+ WorkerId: params.WorkerId,
+ }
+
+ info := middleware.GetUserInfo(c)
+ if info != nil {
+ record.Creator = info.NickName
+ }
+
+ err = models.NewWorkerPositionSearch().Create(record)
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鍒涘缓澶辫触, 璇烽噸璇�")
+ return
+ }
+ util.ResponseFormat(c, code.Success, "鍒涘缓鎴愬姛")
+}
+
+// UpdateWorkerPositionInfo
+// @Tags 鏈哄彴绠＄悊
+// @Summary 鏇存柊鏈哄彴淇℃伅
+// @Produce application/json
+// @Param object body request.UpdateWorkerPositionRequest true "鍙傛暟"
+// @Param Authorization header string true "token"
+// @Success 200 {object} util.Response "鎴愬姛"
+// @Router /api-jl/v1/workerPosition/updateWorkerPositionInfo [post]
+func (slf WorkerPositionController) UpdateWorkerPositionInfo(c *gin.Context) {
+ var params request.UpdateWorkerPositionRequest
+ err := c.BindJSON(¶ms)
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�")
+ return
+ }
+ if params.Id == 0 {
+ util.ResponseFormat(c, code.RequestParamError, "鍙傛暟缂哄け")
+ return
+ }
+
+ record := &models.WorkerPosition{
+ StartDate: params.StartDate,
+ EndDate: params.EndDate,
+ Workshop: params.Workshop,
+ WorkshopGroup: params.WorkshopGroup,
+ StartWorkerPosition: params.StartWorkerPosition,
+ EndWorkerPosition: params.EndWorkerPosition,
+ WorkerId: params.WorkerId,
+ }
+
+ info := middleware.GetUserInfo(c)
+ if info != nil {
+ record.Creator = info.NickName
+ }
+
+ err = models.NewWorkerPositionSearch().SetID(params.Id).Update(record)
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鏇存柊澶辫触")
+ return
+ }
+ util.ResponseFormat(c, code.Success, "鏇存柊鎴愬姛")
+}
+
+// GetWorkerPositionList
+//
+// @Tags 鏈哄彴绠＄悊
+// @Summary 鑾峰彇鏈哄彴淇℃伅鍒楄〃
+// @Produce application/json
+// @Param object body request.GetWorkerPositionList true "鍙傛暟"
+// @Param Authorization header string true "token"
+// @Success 200 {object} util.ResponseList{data=[]models.WorkerPosition} "鎴愬姛"
+// @Router /api-jl/v1/workerPosition/getWorkerPositionList [post]
+func (slf WorkerPositionController) GetWorkerPositionList(c *gin.Context) {
+ var params request.GetWorkerPositionList
+ err := c.BindJSON(¶ms)
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�")
+ return
+ }
+ WorkerPositions, total, err := models.NewWorkerPositionSearch().SetPage(params.Page, params.PageSize).SetKeyword(params.Keyword).SetPreload().Find()
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鏌ヨ澶辫触")
+ return
+ }
+ util.ResponseFormatList(c, code.Success, WorkerPositions, total)
+}
+
+// DeleteWorkerPositionInfo
+//
+// @Tags 鏈哄彴绠＄悊
+// @Summary 鍒犻櫎鏈哄彴淇℃伅
+// @Produce application/json
+// @Param id path string true "id"
+// @Param Authorization header string true "token"
+// @Success 200 {object} util.Response "鎴愬姛"
+// @Router /api-jl/v1/workerPosition/deleteWorkerPositionInfo/{id} [delete]
+func (slf WorkerPositionController) DeleteWorkerPositionInfo(c *gin.Context) {
+ id := c.Param("id")
+ if id == "" {
+ util.ResponseFormat(c, code.RequestParamError, "鏃犳晥鐨刬d")
+ return
+ }
+ idInt := cast.ToUint(id)
+ if idInt == 0 {
+ util.ResponseFormat(c, code.RequestParamError, "鏃犳晥鐨刬d")
+ return
+ }
+ err := models.NewWorkerPositionSearch().SetID(idInt).Delete()
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鍒犻櫎澶辫触")
+ return
+ }
+ util.ResponseFormat(c, code.Success, "鍒犻櫎鎴愬姛")
+}
diff --git a/docs/docs.go b/docs/docs.go
index fa943c2..3cceedb 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -1915,6 +1915,167 @@
}
}
}
+ },
+ "/api-jl/v1/workerPosition/createWorkerPositionInfo": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鏈哄彴绠＄悊"
+ ],
+ "summary": "鍒涘缓鏈哄彴淇℃伅",
+ "parameters": [
+ {
+ "description": "鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.AddWorkPositionRequest"
+ }
+ },
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
+ },
+ "/api-jl/v1/workerPosition/deleteWorkerPositionInfo/{id}": {
+ "delete": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鏈哄彴绠＄悊"
+ ],
+ "summary": "鍒犻櫎鏈哄彴淇℃伅",
+ "parameters": [
+ {
+ "type": "string",
+ "description": "id",
+ "name": "id",
+ "in": "path",
+ "required": true
+ },
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
+ },
+ "/api-jl/v1/workerPosition/getWorkerPositionList": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鏈哄彴绠＄悊"
+ ],
+ "summary": "鑾峰彇鏈哄彴淇℃伅鍒楄〃",
+ "parameters": [
+ {
+ "description": "鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.GetWorkerPositionList"
+ }
+ },
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/util.ResponseList"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.WorkerPosition"
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
+ "/api-jl/v1/workerPosition/updateWorkerPositionInfo": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鏈哄彴绠＄悊"
+ ],
+ "summary": "鏇存柊鏈哄彴淇℃伅",
+ "parameters": [
+ {
+ "description": "鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.UpdateWorkerPositionRequest"
+ }
+ },
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
}
},
"definitions": {
@@ -2409,7 +2570,7 @@
"type": "string"
},
"worker": {
- "description": "宸ヤ汉ID",
+ "description": "宸ヤ汉",
"allOf": [
{
"$ref": "#/definitions/models.Worker"
@@ -2590,6 +2751,62 @@
"type": "string"
},
"workTypeId": {
+ "type": "integer"
+ }
+ }
+ },
+ "models.WorkerPosition": {
+ "type": "object",
+ "properties": {
+ "createdAt": {
+ "type": "string"
+ },
+ "creator": {
+ "type": "string"
+ },
+ "deletedAt": {
+ "$ref": "#/definitions/gorm.DeletedAt"
+ },
+ "endDate": {
+ "description": "缁撴潫鏃ユ湡",
+ "type": "string"
+ },
+ "endWorkerPosition": {
+ "description": "缁撴潫杞﹀彿",
+ "type": "integer"
+ },
+ "id": {
+ "type": "integer"
+ },
+ "name": {
+ "description": "杞﹂棿",
+ "type": "string"
+ },
+ "startDate": {
+ "description": "寮�濮嬫棩鏈�",
+ "type": "string"
+ },
+ "startWorkerPosition": {
+ "description": "寮�濮嬭溅鍙�",
+ "type": "integer"
+ },
+ "updatedAt": {
+ "type": "string"
+ },
+ "worker": {
+ "description": "宸ヤ汉",
+ "allOf": [
+ {
+ "$ref": "#/definitions/models.Worker"
+ }
+ ]
+ },
+ "workerId": {
+ "description": "宸ヤ汉ID",
+ "type": "string"
+ },
+ "workshopGroup": {
+ "description": "杞︾粍",
"type": "integer"
}
}
@@ -2931,6 +3148,48 @@
}
}
},
+ "request.AddWorkPositionRequest": {
+ "type": "object",
+ "required": [
+ "endDate",
+ "endWorkerPosition",
+ "startDate",
+ "startWorkerPosition",
+ "workerId",
+ "workshop",
+ "workshopGroup"
+ ],
+ "properties": {
+ "endDate": {
+ "description": "缁撴潫鏃ユ湡",
+ "type": "string"
+ },
+ "endWorkerPosition": {
+ "description": "缁撴潫杞﹀彿",
+ "type": "integer"
+ },
+ "startDate": {
+ "description": "寮�濮嬫棩鏈�",
+ "type": "string"
+ },
+ "startWorkerPosition": {
+ "description": "寮�濮嬭溅鍙�",
+ "type": "integer"
+ },
+ "workerId": {
+ "description": "宸ヤ汉ID",
+ "type": "string"
+ },
+ "workshop": {
+ "description": "杞﹂棿",
+ "type": "string"
+ },
+ "workshopGroup": {
+ "description": "杞︾粍",
+ "type": "integer"
+ }
+ }
+ },
"request.ChangeYieldRegister": {
"type": "object",
"properties": {
@@ -3070,6 +3329,22 @@
}
},
"request.GetWorkerList": {
+ "type": "object",
+ "properties": {
+ "keyword": {
+ "type": "string"
+ },
+ "page": {
+ "description": "椤电爜",
+ "type": "integer"
+ },
+ "pageSize": {
+ "description": "姣忛〉澶у皬",
+ "type": "integer"
+ }
+ }
+ },
+ "request.GetWorkerPositionList": {
"type": "object",
"properties": {
"keyword": {
@@ -3267,6 +3542,51 @@
}
}
},
+ "request.UpdateWorkerPositionRequest": {
+ "type": "object",
+ "required": [
+ "endDate",
+ "endWorkerPosition",
+ "startDate",
+ "startWorkerPosition",
+ "workerId",
+ "workshop",
+ "workshopGroup"
+ ],
+ "properties": {
+ "endDate": {
+ "description": "缁撴潫鏃ユ湡",
+ "type": "string"
+ },
+ "endWorkerPosition": {
+ "description": "缁撴潫杞﹀彿",
+ "type": "integer"
+ },
+ "id": {
+ "type": "integer"
+ },
+ "startDate": {
+ "description": "寮�濮嬫棩鏈�",
+ "type": "string"
+ },
+ "startWorkerPosition": {
+ "description": "寮�濮嬭溅鍙�",
+ "type": "integer"
+ },
+ "workerId": {
+ "description": "宸ヤ汉ID",
+ "type": "string"
+ },
+ "workshop": {
+ "description": "杞﹂棿",
+ "type": "string"
+ },
+ "workshopGroup": {
+ "description": "杞︾粍",
+ "type": "integer"
+ }
+ }
+ },
"request.YieldRegisterCircleInfo": {
"type": "object",
"properties": {
diff --git a/docs/swagger.json b/docs/swagger.json
index d5a3066..4857f9d 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -1903,6 +1903,167 @@
}
}
}
+ },
+ "/api-jl/v1/workerPosition/createWorkerPositionInfo": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鏈哄彴绠＄悊"
+ ],
+ "summary": "鍒涘缓鏈哄彴淇℃伅",
+ "parameters": [
+ {
+ "description": "鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.AddWorkPositionRequest"
+ }
+ },
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
+ },
+ "/api-jl/v1/workerPosition/deleteWorkerPositionInfo/{id}": {
+ "delete": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鏈哄彴绠＄悊"
+ ],
+ "summary": "鍒犻櫎鏈哄彴淇℃伅",
+ "parameters": [
+ {
+ "type": "string",
+ "description": "id",
+ "name": "id",
+ "in": "path",
+ "required": true
+ },
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
+ },
+ "/api-jl/v1/workerPosition/getWorkerPositionList": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鏈哄彴绠＄悊"
+ ],
+ "summary": "鑾峰彇鏈哄彴淇℃伅鍒楄〃",
+ "parameters": [
+ {
+ "description": "鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.GetWorkerPositionList"
+ }
+ },
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/util.ResponseList"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.WorkerPosition"
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
+ "/api-jl/v1/workerPosition/updateWorkerPositionInfo": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鏈哄彴绠＄悊"
+ ],
+ "summary": "鏇存柊鏈哄彴淇℃伅",
+ "parameters": [
+ {
+ "description": "鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.UpdateWorkerPositionRequest"
+ }
+ },
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
}
},
"definitions": {
@@ -2397,7 +2558,7 @@
"type": "string"
},
"worker": {
- "description": "宸ヤ汉ID",
+ "description": "宸ヤ汉",
"allOf": [
{
"$ref": "#/definitions/models.Worker"
@@ -2578,6 +2739,62 @@
"type": "string"
},
"workTypeId": {
+ "type": "integer"
+ }
+ }
+ },
+ "models.WorkerPosition": {
+ "type": "object",
+ "properties": {
+ "createdAt": {
+ "type": "string"
+ },
+ "creator": {
+ "type": "string"
+ },
+ "deletedAt": {
+ "$ref": "#/definitions/gorm.DeletedAt"
+ },
+ "endDate": {
+ "description": "缁撴潫鏃ユ湡",
+ "type": "string"
+ },
+ "endWorkerPosition": {
+ "description": "缁撴潫杞﹀彿",
+ "type": "integer"
+ },
+ "id": {
+ "type": "integer"
+ },
+ "name": {
+ "description": "杞﹂棿",
+ "type": "string"
+ },
+ "startDate": {
+ "description": "寮�濮嬫棩鏈�",
+ "type": "string"
+ },
+ "startWorkerPosition": {
+ "description": "寮�濮嬭溅鍙�",
+ "type": "integer"
+ },
+ "updatedAt": {
+ "type": "string"
+ },
+ "worker": {
+ "description": "宸ヤ汉",
+ "allOf": [
+ {
+ "$ref": "#/definitions/models.Worker"
+ }
+ ]
+ },
+ "workerId": {
+ "description": "宸ヤ汉ID",
+ "type": "string"
+ },
+ "workshopGroup": {
+ "description": "杞︾粍",
"type": "integer"
}
}
@@ -2919,6 +3136,48 @@
}
}
},
+ "request.AddWorkPositionRequest": {
+ "type": "object",
+ "required": [
+ "endDate",
+ "endWorkerPosition",
+ "startDate",
+ "startWorkerPosition",
+ "workerId",
+ "workshop",
+ "workshopGroup"
+ ],
+ "properties": {
+ "endDate": {
+ "description": "缁撴潫鏃ユ湡",
+ "type": "string"
+ },
+ "endWorkerPosition": {
+ "description": "缁撴潫杞﹀彿",
+ "type": "integer"
+ },
+ "startDate": {
+ "description": "寮�濮嬫棩鏈�",
+ "type": "string"
+ },
+ "startWorkerPosition": {
+ "description": "寮�濮嬭溅鍙�",
+ "type": "integer"
+ },
+ "workerId": {
+ "description": "宸ヤ汉ID",
+ "type": "string"
+ },
+ "workshop": {
+ "description": "杞﹂棿",
+ "type": "string"
+ },
+ "workshopGroup": {
+ "description": "杞︾粍",
+ "type": "integer"
+ }
+ }
+ },
"request.ChangeYieldRegister": {
"type": "object",
"properties": {
@@ -3058,6 +3317,22 @@
}
},
"request.GetWorkerList": {
+ "type": "object",
+ "properties": {
+ "keyword": {
+ "type": "string"
+ },
+ "page": {
+ "description": "椤电爜",
+ "type": "integer"
+ },
+ "pageSize": {
+ "description": "姣忛〉澶у皬",
+ "type": "integer"
+ }
+ }
+ },
+ "request.GetWorkerPositionList": {
"type": "object",
"properties": {
"keyword": {
@@ -3255,6 +3530,51 @@
}
}
},
+ "request.UpdateWorkerPositionRequest": {
+ "type": "object",
+ "required": [
+ "endDate",
+ "endWorkerPosition",
+ "startDate",
+ "startWorkerPosition",
+ "workerId",
+ "workshop",
+ "workshopGroup"
+ ],
+ "properties": {
+ "endDate": {
+ "description": "缁撴潫鏃ユ湡",
+ "type": "string"
+ },
+ "endWorkerPosition": {
+ "description": "缁撴潫杞﹀彿",
+ "type": "integer"
+ },
+ "id": {
+ "type": "integer"
+ },
+ "startDate": {
+ "description": "寮�濮嬫棩鏈�",
+ "type": "string"
+ },
+ "startWorkerPosition": {
+ "description": "寮�濮嬭溅鍙�",
+ "type": "integer"
+ },
+ "workerId": {
+ "description": "宸ヤ汉ID",
+ "type": "string"
+ },
+ "workshop": {
+ "description": "杞﹂棿",
+ "type": "string"
+ },
+ "workshopGroup": {
+ "description": "杞︾粍",
+ "type": "integer"
+ }
+ }
+ },
"request.YieldRegisterCircleInfo": {
"type": "object",
"properties": {
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index fe55a41..2e0c19d 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -357,7 +357,7 @@
worker:
allOf:
- $ref: '#/definitions/models.Worker'
- description: 宸ヤ汉ID
+ description: 宸ヤ汉
workerId:
description: 宸ヤ汉ID
type: string
@@ -473,6 +473,44 @@
workType:
type: string
workTypeId:
+ type: integer
+ type: object
+ models.WorkerPosition:
+ properties:
+ createdAt:
+ type: string
+ creator:
+ type: string
+ deletedAt:
+ $ref: '#/definitions/gorm.DeletedAt'
+ endDate:
+ description: 缁撴潫鏃ユ湡
+ type: string
+ endWorkerPosition:
+ description: 缁撴潫杞﹀彿
+ type: integer
+ id:
+ type: integer
+ name:
+ description: 杞﹂棿
+ type: string
+ startDate:
+ description: 寮�濮嬫棩鏈�
+ type: string
+ startWorkerPosition:
+ description: 寮�濮嬭溅鍙�
+ type: integer
+ updatedAt:
+ type: string
+ worker:
+ allOf:
+ - $ref: '#/definitions/models.Worker'
+ description: 宸ヤ汉
+ workerId:
+ description: 宸ヤ汉ID
+ type: string
+ workshopGroup:
+ description: 杞︾粍
type: integer
type: object
models.WorkshopManage:
@@ -703,6 +741,38 @@
description: 宸ヤ汉ID
type: string
type: object
+ request.AddWorkPositionRequest:
+ properties:
+ endDate:
+ description: 缁撴潫鏃ユ湡
+ type: string
+ endWorkerPosition:
+ description: 缁撴潫杞﹀彿
+ type: integer
+ startDate:
+ description: 寮�濮嬫棩鏈�
+ type: string
+ startWorkerPosition:
+ description: 寮�濮嬭溅鍙�
+ type: integer
+ workerId:
+ description: 宸ヤ汉ID
+ type: string
+ workshop:
+ description: 杞﹂棿
+ type: string
+ workshopGroup:
+ description: 杞︾粍
+ type: integer
+ required:
+ - endDate
+ - endWorkerPosition
+ - startDate
+ - startWorkerPosition
+ - workerId
+ - workshop
+ - workshopGroup
+ type: object
request.ChangeYieldRegister:
properties:
createTime:
@@ -800,6 +870,17 @@
type: integer
type: object
request.GetWorkerList:
+ properties:
+ keyword:
+ type: string
+ page:
+ description: 椤电爜
+ type: integer
+ pageSize:
+ description: 姣忛〉澶у皬
+ type: integer
+ type: object
+ request.GetWorkerPositionList:
properties:
keyword:
type: string
@@ -930,6 +1011,40 @@
workerId:
description: 宸ヤ汉ID
type: string
+ type: object
+ request.UpdateWorkerPositionRequest:
+ properties:
+ endDate:
+ description: 缁撴潫鏃ユ湡
+ type: string
+ endWorkerPosition:
+ description: 缁撴潫杞﹀彿
+ type: integer
+ id:
+ type: integer
+ startDate:
+ description: 寮�濮嬫棩鏈�
+ type: string
+ startWorkerPosition:
+ description: 寮�濮嬭溅鍙�
+ type: integer
+ workerId:
+ description: 宸ヤ汉ID
+ type: string
+ workshop:
+ description: 杞﹂棿
+ type: string
+ workshopGroup:
+ description: 杞︾粍
+ type: integer
+ required:
+ - endDate
+ - endWorkerPosition
+ - startDate
+ - startWorkerPosition
+ - workerId
+ - workshop
+ - workshopGroup
type: object
request.YieldRegisterCircleInfo:
properties:
@@ -2333,4 +2448,106 @@
summary: 鏇存柊浜哄憳淇℃伅
tags:
- 鍛樺伐绠＄悊/鍛樺伐淇℃伅
+ /api-jl/v1/workerPosition/createWorkerPositionInfo:
+ post:
+ parameters:
+ - description: 鍙傛暟
+ in: body
+ name: object
+ required: true
+ schema:
+ $ref: '#/definitions/request.AddWorkPositionRequest'
+ - 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/workerPosition/deleteWorkerPositionInfo/{id}:
+ delete:
+ parameters:
+ - description: id
+ in: path
+ name: id
+ required: true
+ type: string
+ - 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/workerPosition/getWorkerPositionList:
+ post:
+ parameters:
+ - description: 鍙傛暟
+ in: body
+ name: object
+ required: true
+ schema:
+ $ref: '#/definitions/request.GetWorkerPositionList'
+ - description: token
+ in: header
+ name: Authorization
+ required: true
+ type: string
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ allOf:
+ - $ref: '#/definitions/util.ResponseList'
+ - properties:
+ data:
+ items:
+ $ref: '#/definitions/models.WorkerPosition'
+ type: array
+ type: object
+ summary: 鑾峰彇鏈哄彴淇℃伅鍒楄〃
+ tags:
+ - 鏈哄彴绠＄悊
+ /api-jl/v1/workerPosition/updateWorkerPositionInfo:
+ post:
+ parameters:
+ - description: 鍙傛暟
+ in: body
+ name: object
+ required: true
+ schema:
+ $ref: '#/definitions/request.UpdateWorkerPositionRequest'
+ - description: token
+ in: header
+ name: Authorization
+ required: true
+ type: string
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ $ref: '#/definitions/util.Response'
+ summary: 鏇存柊鏈哄彴淇℃伅
+ tags:
+ - 鏈哄彴绠＄悊
swagger: "2.0"
diff --git a/models/db.go b/models/db.go
index d96e5be..ee9230d 100644
--- a/models/db.go
+++ b/models/db.go
@@ -89,6 +89,7 @@
SalaryPlan{},
Mentor{},
AttendanceManage{},
+ WorkerPosition{},
)
return err
}
diff --git a/models/mentor.go b/models/mentor.go
index 24ed1d1..3028b18 100644
--- a/models/mentor.go
+++ b/models/mentor.go
@@ -11,7 +11,7 @@
Mentor struct {
gorm.Model
WorkerId string `gorm:"unique_index:worker_id_month;type:varchar(255);not null;default:'';comment:宸ヤ汉ID" json:"workerId"` //宸ヤ汉ID
- Worker Worker `gorm:"foreignkey:WorkerId" json:"worker"` //宸ヤ汉ID
+ Worker Worker `gorm:"foreignkey:WorkerId" json:"worker"` //宸ヤ汉
Creator string `gorm:"type:varchar(255);not null;default:'';comment:娣诲姞浜�" json:"creator"`
Month string `gorm:"unique_index:worker_id_month;type:varchar(255);not null;default:'';comment:鏈堜唤" json:"month"` //鏈堜唤
Days int `gorm:"type:tinyint;not null;default:0;comment:澶╂暟" json:"days"` //澶╂暟
diff --git a/models/worker_position.go b/models/worker_position.go
new file mode 100644
index 0000000..5597232
--- /dev/null
+++ b/models/worker_position.go
@@ -0,0 +1,288 @@
+package models
+
+import (
+ "fmt"
+ "gorm.io/gorm"
+ "silkserver/pkg/mysqlx"
+)
+
+type (
+ // WorkerPosition 鏈哄彴绠＄悊
+ WorkerPosition struct {
+ gorm.Model
+ StartDate string `gorm:"type:varchar(255);not null;default:'';comment:寮�濮嬫棩鏈�"` //寮�濮嬫棩鏈�
+ EndDate string `gorm:"type:varchar(255);not null;default:'';comment:缁撴潫鏃ユ湡"` //缁撴潫鏃ユ湡
+ Workshop string `gorm:"type:varchar(255);not null;comment:杞﹂棿" json:"name"` //杞﹂棿
+ WorkshopGroup int `gorm:"type:int(11);not null;default:0;comment:杞︾粍" json:"workshopGroup"` //杞︾粍
+ StartWorkerPosition int `json:"startWorkerPosition" gorm:"type:int(11);comment:寮�濮嬭溅鍙�"` //寮�濮嬭溅鍙�
+ EndWorkerPosition int `json:"endWorkerPosition" gorm:"type:int(11);comment:缁撴潫杞﹀彿"` //缁撴潫杞﹀彿
+ WorkerId string `gorm:"type:varchar(255);not null;default:'';comment:宸ヤ汉ID" json:"workerId"` //宸ヤ汉ID
+ Worker Worker `gorm:"foreignkey:WorkerId" json:"worker"` //宸ヤ汉
+ Creator string `gorm:"type:varchar(255);not null;default:'';comment:娣诲姞浜�" json:"creator"`
+ }
+ WorkerPositionSearch struct {
+ WorkerPosition
+ Order string
+ PageNum int
+ PageSize int
+ Orm *gorm.DB
+ Preload bool
+ Keyword string
+ }
+)
+
+func (slf *WorkerPosition) TableName() string {
+ return "silk_worker_position"
+}
+
+func NewWorkerPositionSearch() *WorkerPositionSearch {
+ return &WorkerPositionSearch{Orm: mysqlx.GetDB()}
+}
+
+func (slf *WorkerPositionSearch) SetOrm(tx *gorm.DB) *WorkerPositionSearch {
+ slf.Orm = tx
+ return slf
+}
+
+func (slf *WorkerPositionSearch) SetPage(page, size int) *WorkerPositionSearch {
+ slf.PageNum, slf.PageSize = page, size
+ return slf
+}
+
+func (slf *WorkerPositionSearch) SetOrder(order string) *WorkerPositionSearch {
+ slf.Order = order
+ return slf
+}
+
+func (slf *WorkerPositionSearch) SetPreload() *WorkerPositionSearch {
+ slf.Preload = true
+ return slf
+}
+
+func (slf *WorkerPositionSearch) SetID(id uint) *WorkerPositionSearch {
+ slf.ID = id
+ return slf
+}
+
+func (slf *WorkerPositionSearch) SetWorkerID(id string) *WorkerPositionSearch {
+ slf.WorkerId = id
+ return slf
+}
+
+func (slf *WorkerPositionSearch) SetKeyword(keyword string) *WorkerPositionSearch {
+ slf.Keyword = keyword
+ return slf
+}
+
+func (slf *WorkerPositionSearch) SetWorkshop(workshop string) *WorkerPositionSearch {
+ slf.Workshop = workshop
+ return slf
+}
+
+func (slf *WorkerPositionSearch) SetWorkshopGroup(group int) *WorkerPositionSearch {
+ slf.WorkshopGroup = group
+ return slf
+}
+
+func (slf *WorkerPositionSearch) 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)
+ }
+
+ if slf.Keyword != "" {
+ kw := "%" + slf.Keyword + "%"
+ db = db.Joins("Worker").Where("silk_mentor.worker_id LIKE ? or Worker.name LIKE ?", kw, kw)
+ }
+
+ if slf.Workshop != "" {
+ db = db.Where("workshop = ?", slf.Workshop)
+ }
+
+ if slf.WorkshopGroup > 0 {
+ db = db.Where("workshop_group = ?", slf.WorkshopGroup)
+ }
+
+ if slf.WorkerId != "" {
+ db = db.Where("worker_id = ?", slf.WorkerId)
+ }
+
+ if slf.Preload {
+ db = db.Model(&WorkerPosition{}).Preload("Worker")
+ }
+
+ return db
+}
+
+// Create 鍗曟潯鎻掑叆
+func (slf *WorkerPositionSearch) Create(record *WorkerPosition) 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 *WorkerPositionSearch) CreateBatch(records []*WorkerPosition) 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 *WorkerPositionSearch) Save(record *WorkerPosition) 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 *WorkerPositionSearch) Update(record *WorkerPosition) 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 *WorkerPositionSearch) 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 *WorkerPositionSearch) 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 *WorkerPositionSearch) Delete() error {
+ var db = slf.build()
+
+ if err := db.Unscoped().Delete(&WorkerPosition{}).Error; err != nil {
+ return err
+ }
+
+ return nil
+}
+
+func (slf *WorkerPositionSearch) First() (*WorkerPosition, error) {
+ var (
+ record = new(WorkerPosition)
+ db = slf.build()
+ )
+
+ if err := db.First(record).Error; err != nil {
+ return record, err
+ }
+
+ return record, nil
+}
+
+func (slf *WorkerPositionSearch) Find() ([]*WorkerPosition, int64, error) {
+ var (
+ records = make([]*WorkerPosition, 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 *WorkerPositionSearch) FindAll() ([]*WorkerPosition, error) {
+ var (
+ records = make([]*WorkerPosition, 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 *WorkerPositionSearch) FindByQuery(query string, args []interface{}) ([]*WorkerPosition, int64, error) {
+ var (
+ records = make([]*WorkerPosition, 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 *WorkerPositionSearch) FindByQueryNotTotal(query string, args []interface{}) ([]*WorkerPosition, error) {
+ var (
+ records = make([]*WorkerPosition, 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 *WorkerPositionSearch) InitDefaultData() error {
+ return nil
+}
diff --git a/router/router.go b/router/router.go
index 98fa0f0..e4e97e8 100644
--- a/router/router.go
+++ b/router/router.go
@@ -119,5 +119,14 @@
mentorApi.DELETE("deleteMentorInfo/:id", mentorCtl.DeleteMentorInfo) //鍒犻櫎甯﹀緬淇℃伅
}
+ wpApi := r.Group(urlPrefix + "/workerPosition")
+ wpCtl := new(controllers.WorkerPositionController)
+ {
+ wpApi.POST("createWorkerPositionInfo", wpCtl.CreateWorkerPositionInfo) //鍒涘缓鏈哄彴淇℃伅
+ wpApi.POST("updateWorkerPositionInfo", wpCtl.UpdateWorkerPositionInfo) //鏇存柊鏈哄彴淇℃伅
+ wpApi.POST("getWorkerPositionList", wpCtl.GetWorkerPositionList) //鑾峰彇鏈哄彴淇℃伅鍒楄〃
+ wpApi.DELETE("deleteWorkerPositionInfo/:id", wpCtl.DeleteWorkerPositionInfo) //鍒犻櫎鏈哄彴淇℃伅
+ }
+
return r
}
--
Gitblit v1.8.0