Merge branch 'feat-cjy-taskBench' into dev

This commit is contained in:
cjy 2025-09-03 17:59:00 +08:00
commit 4a97727775

View File

@ -8,6 +8,7 @@ import (
"fonchain-fiee/api/cast" "fonchain-fiee/api/cast"
"fonchain-fiee/cmd/config" "fonchain-fiee/cmd/config"
modelCast "fonchain-fiee/pkg/model/cast" modelCast "fonchain-fiee/pkg/model/cast"
"fonchain-fiee/pkg/model/login"
"fonchain-fiee/pkg/service" "fonchain-fiee/pkg/service"
castService "fonchain-fiee/pkg/service/cast" castService "fonchain-fiee/pkg/service/cast"
"strconv" "strconv"
@ -36,9 +37,9 @@ func GetPendingTaskList(c *gin.Context) {
// AssignTask 指派某位员工完成某个艺人的任务 // AssignTask 指派某位员工完成某个艺人的任务
func AssignTask(c *gin.Context) { func AssignTask(c *gin.Context) {
var req bundle.TaskAssignRequest var req bundle.TaskAssignRequest
// userInfo := login.GetUserInfoFromC(c) userInfo := login.GetUserInfoFromC(c)
// req.OperatorNum = userInfo.TelNum req.OperatorNum = userInfo.TelNum
// req.Operator = userInfo.Name req.Operator = userInfo.Name
if err := c.ShouldBindJSON(&req); err != nil { if err := c.ShouldBindJSON(&req); err != nil {
service.Error(c, err) service.Error(c, err)
return return
@ -109,8 +110,8 @@ func GetEmployeeAssignedTasks(c *gin.Context) {
// CompleteTaskManually 员工手动点击完成任务 // CompleteTaskManually 员工手动点击完成任务
func CompleteTaskManually(c *gin.Context) { func CompleteTaskManually(c *gin.Context) {
var req bundle.CompleteTaskManuallyRequest var req bundle.CompleteTaskManuallyRequest
// userInfo := login.GetUserInfoFromC(c) userInfo := login.GetUserInfoFromC(c)
// req.TaskAssigneeNum = userInfo.TelNum req.TaskAssigneeNum = userInfo.TelNum
if err := c.ShouldBindJSON(&req); err != nil { if err := c.ShouldBindJSON(&req); err != nil {
service.Error(c, err) service.Error(c, err)
return return