Compare commits
No commits in common. "ebfe9f69e0f921b3db9439a6c062e0db6060ebc3" and "acc03e03a63a924902e4ee6c84ef54593c8a72b0" have entirely different histories.
ebfe9f69e0
...
acc03e03a6
@ -53,9 +53,6 @@ func TaskBenchRouter(r *gin.RouterGroup) {
|
|||||||
// 员工完成视频作品任务(带任务UUID)
|
// 员工完成视频作品任务(带任务UUID)
|
||||||
taskBenchRoute.POST("update-work-video-with-task-uuid", taskbench.UpdateWorkVideoWithUUID)
|
taskBenchRoute.POST("update-work-video-with-task-uuid", taskbench.UpdateWorkVideoWithUUID)
|
||||||
|
|
||||||
// 员工完成视频脚本(带任务UUID)
|
|
||||||
taskBenchRoute.POST("update-script-with-task-uuid", taskbench.UpdateVideoScriptWithUUID)
|
|
||||||
|
|
||||||
// 根据登录人信息查询被指派给该员工的任务
|
// 根据登录人信息查询被指派给该员工的任务
|
||||||
taskBenchRoute.POST("assigned-tasks", taskbench.GetEmployeeAssignedTasks)
|
taskBenchRoute.POST("assigned-tasks", taskbench.GetEmployeeAssignedTasks)
|
||||||
|
|
||||||
|
|||||||
@ -9,7 +9,6 @@ import (
|
|||||||
"fonchain-fiee/api/bundle"
|
"fonchain-fiee/api/bundle"
|
||||||
"fonchain-fiee/api/cast"
|
"fonchain-fiee/api/cast"
|
||||||
"fonchain-fiee/cmd/config"
|
"fonchain-fiee/cmd/config"
|
||||||
"fonchain-fiee/pkg/e"
|
|
||||||
modelCast "fonchain-fiee/pkg/model/cast"
|
modelCast "fonchain-fiee/pkg/model/cast"
|
||||||
"fonchain-fiee/pkg/model/login"
|
"fonchain-fiee/pkg/model/login"
|
||||||
"fonchain-fiee/pkg/service"
|
"fonchain-fiee/pkg/service"
|
||||||
@ -332,11 +331,6 @@ type UpdateWorkImageWithTaskUUIDReq struct {
|
|||||||
AssignRecordsUUID string `json:"assignRecordsUUID"`
|
AssignRecordsUUID string `json:"assignRecordsUUID"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type UpdateVideoScriptWithTaskUUIDReq struct {
|
|
||||||
*cast.UpdateVideoScriptReq
|
|
||||||
AssignRecordsUUID string `json:"assignRecordsUUID"`
|
|
||||||
}
|
|
||||||
|
|
||||||
func UpdateWorkImageWithTaskUUID(ctx *gin.Context) {
|
func UpdateWorkImageWithTaskUUID(ctx *gin.Context) {
|
||||||
var req UpdateWorkImageWithTaskUUIDReq
|
var req UpdateWorkImageWithTaskUUIDReq
|
||||||
var infoResp *accountFiee.UserInfoResponse
|
var infoResp *accountFiee.UserInfoResponse
|
||||||
@ -586,67 +580,3 @@ func GetArtistUploadStatsListDownload(c *gin.Context) {
|
|||||||
utils.ResponseXls(c, content, "艺人待上传列表")
|
utils.ResponseXls(c, content, "艺人待上传列表")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// UpdateVideoScript 更新视频脚本
|
|
||||||
func UpdateVideoScriptWithUUID(ctx *gin.Context) {
|
|
||||||
var req UpdateVideoScriptWithTaskUUIDReq
|
|
||||||
var infoResp *accountFiee.UserInfoResponse
|
|
||||||
var err error
|
|
||||||
if err = ctx.ShouldBind(&req); err != nil {
|
|
||||||
service.Error(ctx, err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// 先查询该任务是不是已中止状态
|
|
||||||
res, err := service.BundleProvider.GetTaskActualStatusByUUID(context.Background(), &bundle.GetTaskActualStatusByUUIDRequest{
|
|
||||||
AssignRecordsUUID: req.AssignRecordsUUID,
|
|
||||||
})
|
|
||||||
if err != nil {
|
|
||||||
service.Error(ctx, err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if res.ActualStatus == 3 {
|
|
||||||
service.Error(ctx, errors.New("任务已中止,不能上传视频脚本"))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
newCtx := castService.NewCtxWithUserInfo(ctx)
|
|
||||||
artistId, _ := strconv.ParseUint(req.ArtistUuid, 10, 64)
|
|
||||||
infoResp, err = service.AccountFieeProvider.Info(context.Background(), &accountFiee.InfoRequest{
|
|
||||||
ID: artistId,
|
|
||||||
Domain: "app",
|
|
||||||
})
|
|
||||||
if err != nil {
|
|
||||||
service.Error(ctx, err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if infoResp.Id == 0 {
|
|
||||||
service.Error(ctx, errors.New(e.GetMsg(e.NOTDATA)))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
req.ArtistName = infoResp.Name
|
|
||||||
req.ArtistPhone = infoResp.TelNum
|
|
||||||
req.ArtistNum = infoResp.SubNum
|
|
||||||
resp, err := service.CastProvider.UpdateVideoScript(newCtx, req.UpdateVideoScriptReq)
|
|
||||||
if err != nil {
|
|
||||||
service.Error(ctx, err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
// EmployeeName 和 EmployeeNum 从 toekn 里面拿
|
|
||||||
userInfo := login.GetUserInfoFromC(ctx)
|
|
||||||
// 调用员工实际任务状态更新
|
|
||||||
resp1, err := service.BundleProvider.UpdateTaskProgress(context.Background(), &bundle.UpdateTaskProgressRequest{
|
|
||||||
AssignRecordsUUID: req.AssignRecordsUUID,
|
|
||||||
EmployeeName: userInfo.Name,
|
|
||||||
EmployeeNum: userInfo.TelNum, // 需要根据实际业务逻辑填充员工工号
|
|
||||||
TaskType: "script",
|
|
||||||
CompleteCount: 1,
|
|
||||||
})
|
|
||||||
if err != nil {
|
|
||||||
service.Error(ctx, err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
zap.L().Info("UpdateTaskProgress", zap.Any("resp", resp1))
|
|
||||||
service.Success(ctx, resp)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user