删除没用controller层没用的注释
This commit is contained in:
parent
2a75c3eb78
commit
a03f14de50
@ -15,11 +15,10 @@ import (
|
|||||||
|
|
||||||
// AssignTask 指派某位员工完成某个艺人的任务
|
// AssignTask 指派某位员工完成某个艺人的任务
|
||||||
func (b *BundleProvider) AssignTask(_ context.Context, req *bundle.TaskAssignRequest) (*bundle.CommonResponse, error) {
|
func (b *BundleProvider) AssignTask(_ context.Context, req *bundle.TaskAssignRequest) (*bundle.CommonResponse, error) {
|
||||||
// 转换请求参数
|
|
||||||
daoReq := &dao.TaskAssignRequest{
|
daoReq := &dao.TaskAssignRequest{
|
||||||
SubNum: req.SubNum,
|
SubNum: req.SubNum,
|
||||||
TelNum: req.TelNum,
|
TelNum: req.TelNum,
|
||||||
ArtistName: req.ArtistName, // 添加缺失的ArtistName字段
|
ArtistName: req.ArtistName,
|
||||||
TaskAssignee: req.TaskAssignee,
|
TaskAssignee: req.TaskAssignee,
|
||||||
TaskAssigneeNum: req.TaskAssigneeNum,
|
TaskAssigneeNum: req.TaskAssigneeNum,
|
||||||
Operator: req.Operator,
|
Operator: req.Operator,
|
||||||
@ -31,7 +30,6 @@ func (b *BundleProvider) AssignTask(_ context.Context, req *bundle.TaskAssignReq
|
|||||||
AssignVideoScriptCount: int(req.AssignVideoScriptCount),
|
AssignVideoScriptCount: int(req.AssignVideoScriptCount),
|
||||||
}
|
}
|
||||||
|
|
||||||
// 调用logic层
|
|
||||||
err := logic.AssignTask(daoReq)
|
err := logic.AssignTask(daoReq)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return &bundle.CommonResponse{
|
return &bundle.CommonResponse{
|
||||||
@ -69,7 +67,6 @@ func (b *BundleProvider) GetEmployeeAssignedTasks(_ context.Context, req *bundle
|
|||||||
if int(req.Status) == 2 {
|
if int(req.Status) == 2 {
|
||||||
req.SortBy = "complete_time"
|
req.SortBy = "complete_time"
|
||||||
}
|
}
|
||||||
// 转换请求参数
|
|
||||||
daoReq := &dao.EmployeeTaskQueryRequest{
|
daoReq := &dao.EmployeeTaskQueryRequest{
|
||||||
TaskAssigneeNum: req.TaskAssigneeNum,
|
TaskAssigneeNum: req.TaskAssigneeNum,
|
||||||
Keyword: req.Keyword,
|
Keyword: req.Keyword,
|
||||||
@ -85,13 +82,11 @@ func (b *BundleProvider) GetEmployeeAssignedTasks(_ context.Context, req *bundle
|
|||||||
TaskBatch: req.TaskBatch,
|
TaskBatch: req.TaskBatch,
|
||||||
}
|
}
|
||||||
|
|
||||||
// 调用logic层
|
|
||||||
records, total, err := logic.GetEmployeeAssignedTasks(daoReq)
|
records, total, err := logic.GetEmployeeAssignedTasks(daoReq)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
// 转换响应数据
|
|
||||||
var recordInfos []*bundle.TaskAssignRecordInfo
|
var recordInfos []*bundle.TaskAssignRecordInfo
|
||||||
for _, record := range records {
|
for _, record := range records {
|
||||||
recordInfo := convertToTaskAssignRecordInfo(record)
|
recordInfo := convertToTaskAssignRecordInfo(record)
|
||||||
@ -108,7 +103,6 @@ func (b *BundleProvider) GetEmployeeAssignedTasks(_ context.Context, req *bundle
|
|||||||
|
|
||||||
// CompleteTaskManually 员工手动点击完成任务
|
// CompleteTaskManually 员工手动点击完成任务
|
||||||
func (b *BundleProvider) CompleteTaskManually(_ context.Context, req *bundle.CompleteTaskManuallyRequest) (*bundle.CommonResponse, error) {
|
func (b *BundleProvider) CompleteTaskManually(_ context.Context, req *bundle.CompleteTaskManuallyRequest) (*bundle.CommonResponse, error) {
|
||||||
// 调用logic层
|
|
||||||
err := logic.CompleteTaskManually(req.AssignRecordsUUID, req.TaskAssigneeNum)
|
err := logic.CompleteTaskManually(req.AssignRecordsUUID, req.TaskAssigneeNum)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return &bundle.CommonResponse{
|
return &bundle.CommonResponse{
|
||||||
@ -123,7 +117,6 @@ func (b *BundleProvider) CompleteTaskManually(_ context.Context, req *bundle.Com
|
|||||||
|
|
||||||
// UpdateTaskProgress 员工实际完成任务状态更新
|
// UpdateTaskProgress 员工实际完成任务状态更新
|
||||||
func (b *BundleProvider) UpdateTaskProgress(_ context.Context, req *bundle.UpdateTaskProgressRequest) (*bundle.CommonResponse, error) {
|
func (b *BundleProvider) UpdateTaskProgress(_ context.Context, req *bundle.UpdateTaskProgressRequest) (*bundle.CommonResponse, error) {
|
||||||
// 转换请求参数
|
|
||||||
daoReq := &dao.CompleteTaskRequest{
|
daoReq := &dao.CompleteTaskRequest{
|
||||||
AssignRecordsUUID: req.AssignRecordsUUID,
|
AssignRecordsUUID: req.AssignRecordsUUID,
|
||||||
EmployeeName: req.EmployeeName,
|
EmployeeName: req.EmployeeName,
|
||||||
@ -133,7 +126,6 @@ func (b *BundleProvider) UpdateTaskProgress(_ context.Context, req *bundle.Updat
|
|||||||
UUID: req.Uuid,
|
UUID: req.Uuid,
|
||||||
}
|
}
|
||||||
|
|
||||||
// 调用logic层
|
|
||||||
err := logic.UpdateTaskProgress(daoReq)
|
err := logic.UpdateTaskProgress(daoReq)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return &bundle.CommonResponse{
|
return &bundle.CommonResponse{
|
||||||
@ -146,9 +138,8 @@ func (b *BundleProvider) UpdateTaskProgress(_ context.Context, req *bundle.Updat
|
|||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// TerminateTaskByUUID 根据指派记录UUID终止任务(实际状态置为已中止)
|
// TerminateTaskByUUID 根据指派记录UUID终止任务
|
||||||
func (b *BundleProvider) TerminateTaskByUUID(_ context.Context, req *bundle.TerminateTaskByUUIDRequest) (*bundle.ComResponse, error) {
|
func (b *BundleProvider) TerminateTaskByUUID(_ context.Context, req *bundle.TerminateTaskByUUIDRequest) (*bundle.ComResponse, error) {
|
||||||
// 调用logic层
|
|
||||||
err := logic.TerminateTaskByUUID(req.AssignRecordsUUID)
|
err := logic.TerminateTaskByUUID(req.AssignRecordsUUID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return &bundle.ComResponse{Msg: err.Error()}, err
|
return &bundle.ComResponse{Msg: err.Error()}, err
|
||||||
@ -201,7 +192,6 @@ func (b *BundleProvider) GetTaskAssignRecordsList(_ context.Context, req *bundle
|
|||||||
if sortBy, ok := model.OrderByPending[req.SortBy]; ok {
|
if sortBy, ok := model.OrderByPending[req.SortBy]; ok {
|
||||||
req.SortBy = sortBy
|
req.SortBy = sortBy
|
||||||
}
|
}
|
||||||
// 转换请求参数
|
|
||||||
daoReq := &dao.TaskAssignRecordsQueryRequest{
|
daoReq := &dao.TaskAssignRecordsQueryRequest{
|
||||||
Keyword: req.Keyword,
|
Keyword: req.Keyword,
|
||||||
TaskAssignee: req.TaskAssignee,
|
TaskAssignee: req.TaskAssignee,
|
||||||
@ -224,7 +214,6 @@ func (b *BundleProvider) GetTaskAssignRecordsList(_ context.Context, req *bundle
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
// 转换响应数据
|
|
||||||
var recordInfos []*bundle.TaskAssignRecordInfo
|
var recordInfos []*bundle.TaskAssignRecordInfo
|
||||||
for _, record := range records {
|
for _, record := range records {
|
||||||
recordInfo := convertToTaskAssignRecordInfo(record)
|
recordInfo := convertToTaskAssignRecordInfo(record)
|
||||||
@ -334,7 +323,6 @@ func (b *BundleProvider) GetArtistUploadStatsList(_ context.Context, req *bundle
|
|||||||
if sortBy, ok := model.OrderByDataAnalysis[req.SortBy]; ok {
|
if sortBy, ok := model.OrderByDataAnalysis[req.SortBy]; ok {
|
||||||
req.SortBy = sortBy
|
req.SortBy = sortBy
|
||||||
}
|
}
|
||||||
// 构造 DAO 请求参数
|
|
||||||
daoReq := &dao.TaskQueryRequest{
|
daoReq := &dao.TaskQueryRequest{
|
||||||
Keyword: req.Keyword,
|
Keyword: req.Keyword,
|
||||||
Page: int(req.Page),
|
Page: int(req.Page),
|
||||||
@ -345,13 +333,11 @@ func (b *BundleProvider) GetArtistUploadStatsList(_ context.Context, req *bundle
|
|||||||
SubNums: req.SubNums,
|
SubNums: req.SubNums,
|
||||||
}
|
}
|
||||||
|
|
||||||
// 调用逻辑层
|
|
||||||
items, total, err := logic.GetArtistUploadStatsList(daoReq)
|
items, total, err := logic.GetArtistUploadStatsList(daoReq)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
// 转换响应数据
|
|
||||||
formatTime := func(s string) string {
|
formatTime := func(s string) string {
|
||||||
if s == "" {
|
if s == "" {
|
||||||
return ""
|
return ""
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user