fiee/fonchain-fiee
10
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feat-cjy-taskBench' into dev

Browse Source
This commit is contained in:
cjy 2025-10-22 18:26:24 +08:00
commit 23394a11b8
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/service/cast/work.go
View File

@ -11,6 +11,7 @@ import (
"fonchain-fiee/pkg/e" "fonchain-fiee/pkg/e"
logicCast "fonchain-fiee/pkg/logic/cast" logicCast "fonchain-fiee/pkg/logic/cast"
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"
"fonchain-fiee/pkg/utils/stime" "fonchain-fiee/pkg/utils/stime"
"strconv" "strconv"
@ -63,12 +64,14 @@ func UpdateWorkImage(ctx *gin.Context) {
return return
} }
// EmployeeName 和 EmployeeNum 从 token 中获取
userInfo := login.GetUserInfoFromC(ctx)
// 更新任务台的任务数量，调用员工实际任务状态更新 // 更新任务台的任务数量，调用员工实际任务状态更新
if service.BundleProvider != nil { if service.BundleProvider != nil {
resp1, err := service.BundleProvider.UpdateTaskProgress(context.Background(), &bundle.UpdateTaskProgressRequest{ resp1, err := service.BundleProvider.UpdateTaskProgress(context.Background(), &bundle.UpdateTaskProgressRequest{
AssignRecordsUUID: "", AssignRecordsUUID: "",
EmployeeName: infoResp.Name, EmployeeName: userInfo.Name,
EmployeeNum: infoResp.TelNum, EmployeeNum: userInfo.TelNum,
TaskType: "post", TaskType: "post",
CompleteCount: 1, CompleteCount: 1,
}) })
@ -128,12 +131,14 @@ func UpdateWorkVideo(ctx *gin.Context) {
return return
} }
// EmployeeName 和 EmployeeNum 从 token 中获取
userInfo := login.GetUserInfoFromC(ctx)
// 更新任务台的任务数量，调用员工实际任务状态更新 // 更新任务台的任务数量，调用员工实际任务状态更新
if service.BundleProvider != nil { if service.BundleProvider != nil {
resp1, err := service.BundleProvider.UpdateTaskProgress(context.Background(), &bundle.UpdateTaskProgressRequest{ resp1, err := service.BundleProvider.UpdateTaskProgress(context.Background(), &bundle.UpdateTaskProgressRequest{
AssignRecordsUUID: "", AssignRecordsUUID: "",
EmployeeName: infoResp.Name, EmployeeName: userInfo.Name,
EmployeeNum: infoResp.TelNum, EmployeeNum: userInfo.TelNum,
TaskType: "video", TaskType: "video",
CompleteCount: 1, CompleteCount: 1,
}) })

12
pkg/service/taskbench/taskBench.go
View File

@ -222,11 +222,13 @@ func UpdateWorkImageWithTaskUUID(ctx *gin.Context) {
service.Error(ctx, err) service.Error(ctx, err)
return return
} }
// EmployeeName 和 EmployeeNum 从 toekn 里面拿
userInfo := login.GetUserInfoFromC(ctx)
// 调用员工实际任务状态更新 // 调用员工实际任务状态更新
resp1, err := service.BundleProvider.UpdateTaskProgress(context.Background(), &bundle.UpdateTaskProgressRequest{ resp1, err := service.BundleProvider.UpdateTaskProgress(context.Background(), &bundle.UpdateTaskProgressRequest{
AssignRecordsUUID: req.AssignRecordsUUID, AssignRecordsUUID: req.AssignRecordsUUID,
EmployeeName: infoResp.Name, EmployeeName: userInfo.Name,
EmployeeNum: infoResp.TelNum, // 需要根据实际业务逻辑填充员工工号 EmployeeNum: userInfo.TelNum, // 需要根据实际业务逻辑填充员工工号
TaskType: "post", TaskType: "post",
CompleteCount: 1, CompleteCount: 1,
}) })
@ -279,11 +281,13 @@ func UpdateWorkVideoWithUUID(ctx *gin.Context) {
service.Error(ctx, err) service.Error(ctx, err)
return return
} }
// EmployeeName 和 EmployeeNum 从 toekn 里面拿
userInfo := login.GetUserInfoFromC(ctx)
// 调用员工实际任务状态更新 // 调用员工实际任务状态更新
resp1, err := service.BundleProvider.UpdateTaskProgress(context.Background(), &bundle.UpdateTaskProgressRequest{ resp1, err := service.BundleProvider.UpdateTaskProgress(context.Background(), &bundle.UpdateTaskProgressRequest{
AssignRecordsUUID: req.AssignRecordsUUID, AssignRecordsUUID: req.AssignRecordsUUID,
EmployeeName: infoResp.Name, EmployeeName: userInfo.Name,
EmployeeNum: infoResp.TelNum, // 需要根据实际业务逻辑填充员工工号 EmployeeNum: userInfo.TelNum, // 需要根据实际业务逻辑填充员工工号
TaskType: "video", TaskType: "video",
CompleteCount: 1, CompleteCount: 1,
}) })