fiee/micro-bundle
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bugfix: 添加进行中的任务和已完成任务数量排序。修改报错提示

Browse Source
This commit is contained in:
cjy 2025-10-20 11:52:28 +08:00
parent c67a84cca7
commit 3e1739d5c0
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
internal/dao/taskDao.go
View File

@ -5,7 +5,6 @@ import (
"micro-bundle/internal/model" "micro-bundle/internal/model"
"micro-bundle/pkg/app" "micro-bundle/pkg/app"
commonErr "micro-bundle/pkg/err" commonErr "micro-bundle/pkg/err"
"micro-bundle/pkg/msg"
"time" "time"
"github.com/google/uuid" "github.com/google/uuid"
@ -408,7 +407,7 @@ func GetPendingTaskList(req *TaskQueryRequest, validArtist []ValidArtistInfo) ([
existQuery := app.ModuleClients.TaskBenchDB.Model(&model.TaskManagement{}).Where("sub_num IN (?)", validArtistIDs) existQuery := app.ModuleClients.TaskBenchDB.Model(&model.TaskManagement{}).Where("sub_num IN (?)", validArtistIDs)
err := existQuery.Find(&existingTasks).Error err := existQuery.Find(&existingTasks).Error
if err != nil { if err != nil {
return nil, 0, commonErr.ReturnError(err, msg.ErrorGetBundleList, "查询现有任务记录失败: ") return nil, 0, commonErr.ReturnError(err, "查询现有任务记录失败", "查询现有任务记录失败: ")
} }
// 创建已存在艺人编号的映射 // 创建已存在艺人编号的映射
@ -484,7 +483,7 @@ func GetPendingTaskList(req *TaskQueryRequest, validArtist []ValidArtistInfo) ([
// 批量创建新的任务记录 // 批量创建新的任务记录
if len(newTasksToCreate) > 0 { if len(newTasksToCreate) > 0 {
if err := app.ModuleClients.TaskBenchDB.Create(&newTasksToCreate).Error; err != nil { if err := app.ModuleClients.TaskBenchDB.Create(&newTasksToCreate).Error; err != nil {
return nil, 0, commonErr.ReturnError(err, msg.ErrorGetBundleList, "创建默认任务记录失败: ") return nil, 0, commonErr.ReturnError(err, "创建默认任务记录失败", "创建默认任务记录失败: ")
} }
} }
@ -522,6 +521,10 @@ func GetPendingTaskList(req *TaskQueryRequest, validArtist []ValidArtistInfo) ([
sortBy = "(pending_bundle_limit_image_expired_count + pending_bundle_limit_image_count + pending_increase_limit_image_expired_count + pending_increase_limit_image_count + pending_bundle_image_count + pending_increase_image_count)" sortBy = "(pending_bundle_limit_image_expired_count + pending_bundle_limit_image_count + pending_increase_limit_image_expired_count + pending_increase_limit_image_count + pending_bundle_image_count + pending_increase_image_count)"
case "pending_data_count", "pendingDataCount": case "pending_data_count", "pendingDataCount":
sortBy = "(pending_bundle_limit_data_analysis_expired_count + pending_bundle_limit_data_analysis_count + pending_increase_limit_data_analysis_expired_count + pending_increase_limit_data_analysis_count + pending_bundle_data_analysis_count + pending_increase_data_analysis_count)" sortBy = "(pending_bundle_limit_data_analysis_expired_count + pending_bundle_limit_data_analysis_count + pending_increase_limit_data_analysis_expired_count + pending_increase_limit_data_analysis_count + pending_bundle_data_analysis_count + pending_increase_data_analysis_count)"
case "progress_count", "progressCount":
sortBy = "progress_count"
case "complete_count", "completeCount":
sortBy = "complete_count"
} }
orderClause := fmt.Sprintf("%s %s", sortBy, sortType) orderClause := fmt.Sprintf("%s %s", sortBy, sortType)
query = query.Order(orderClause) query = query.Order(orderClause)
@ -538,7 +541,7 @@ func GetPendingTaskList(req *TaskQueryRequest, validArtist []ValidArtistInfo) ([
err = query.Find(&tasks).Error err = query.Find(&tasks).Error
if err != nil { if err != nil {
return nil, 0, commonErr.ReturnError(err, msg.ErrorGetBundleList, "查询待指派任务记录失败: ") return nil, 0, commonErr.ReturnError(err, "查询待指派任务记录失败", "查询待指派任务记录失败: ")
} }
return tasks, total, nil return tasks, total, nil