Merge branch 'feat-cjy-taskBench' into dev

# Conflicts:
#	pb/bundle/bundle.pb.go

internal/controller/task.go

@@ -6,6 +6,9 @@ import (
 	"micro-bundle/internal/dao"
 	"micro-bundle/internal/logic"
 	"micro-bundle/pb/bundle"
+	"strings"
+
+	"go.uber.org/zap"
 )
 
 // GetPendingTaskList 查询待指派任务记录
@@ -224,6 +227,26 @@ func (b *BundleProvider) TerminateTaskByUUID(_ context.Context, req *bundle.Term
 	return &bundle.ComResponse{Msg: "任务已终止"}, nil
 }
 
+// BatchTerminateTask 批量终止任务（根据指派记录UUID列表）
+func (b *BundleProvider) BatchTerminateTask(_ context.Context, req *bundle.BatchTerminateTaskRequest) (*bundle.ComResponse, error) {
+	if req == nil || len(req.AssignRecordsUUIDs) == 0 {
+		return &bundle.ComResponse{Msg: "UUID 列表不能为空"}, fmt.Errorf("UUID 列表不能为空")
+	}
+
+	success, fail, failedUUIDs, err := logic.BatchTerminateTaskByUUIDs(req.AssignRecordsUUIDs)
+	if err != nil {
+		return &bundle.ComResponse{Msg: err.Error()}, err
+	}
+
+	// 组装返回信息
+	msg := fmt.Sprintf("批量中止完成：成功 %d 条，失败 %d 条", success, fail)
+	if fail > 0 && len(failedUUIDs) > 0 {
+		msg = fmt.Sprintf("%s（失败UUID：%s）", msg, strings.Join(failedUUIDs, ","))
+	}
+	zap.L().Info(msg)
+	return &bundle.ComResponse{Msg: "批量中止完成"}, nil
+}
+
 // GetTaskActualStatusByUUID 根据指派记录UUID查询实际完成状态
 func (b *BundleProvider) GetTaskActualStatusByUUID(_ context.Context, req *bundle.GetTaskActualStatusByUUIDRequest) (*bundle.GetTaskActualStatusByUUIDResponse, error) {
 	status, err := logic.GetTaskActualStatusByUUID(req.AssignRecordsUUID)
@@ -394,6 +417,7 @@ func (b *BundleProvider) GetArtistUploadStatsList(_ context.Context, req *bundle
         SortBy:           req.SortBy,
         SortType:         req.SortType,
         LastTaskAssignee: req.LastTaskAssignee,
+        SubNums:          req.SubNums,
     }
 
 	// 调用逻辑层

internal/dao/taskDao.go

@@ -22,6 +22,7 @@ type TaskQueryRequest struct {
     PageSize         int    `json:"pageSize"`         // 每页数量
     SortBy           string `json:"sortBy"`           // 排序字段（支持白名单字段）
     SortType         string `json:"sortType"`         // 排序类型 asc/desc
+    SubNums          []string `json:"subNums"`        // 选中导出的艺人编号集合（可选）
 }
 
 // TaskAssignRequest 指派任务请求参数
@@ -438,6 +439,11 @@ func GetArtistUploadStatsList(req *TaskQueryRequest) ([]*ArtistUploadStatsItem,
 		base = base.Where("tm.last_task_assignee LIKE ?", like)
 	}
 
+	// 选中导出艺人编号过滤（IN subNum）
+	if req != nil && len(req.SubNums) > 0 {
+		base = base.Where("bor.customer_num IN ?", req.SubNums)
+	}
+
 	// 统计总数（按艺人编号去重计数）
 	var total int64
 	if err := base.Session(&gorm.Session{}).Distinct("bor.customer_num").Count(&total).Error; err != nil {

internal/logic/taskLogic.go

@@ -255,6 +255,35 @@ func TerminateTaskByUUID(assignRecordsUUID string) error {
     return dao.UpdateTaskActualStatusByUUID(assignRecordsUUID, 3)
 }
 
+// BatchTerminateTaskByUUIDs 批量根据指派记录UUID终止任务（实际状态置为已中止）
+// 返回成功数量、失败数量、失败UUID列表和错误（仅当整体参数错误时返回错误）
+func BatchTerminateTaskByUUIDs(assignRecordsUUIDs []string) (int, int, []string, error) {
+    if len(assignRecordsUUIDs) == 0 {
+        return 0, 0, nil, commonErr.ReturnError(nil, "参数错误", "AssignRecordsUUIDs 不能为空")
+    }
+
+    success := 0
+    failed := 0
+    failedUUIDs := make([]string, 0)
+
+    for _, uuid := range assignRecordsUUIDs {
+        if strings.TrimSpace(uuid) == "" {
+            failed++
+            failedUUIDs = append(failedUUIDs, uuid)
+            continue
+        }
+
+        if err := dao.UpdateTaskActualStatusByUUID(uuid, 3); err != nil {
+            failed++
+            failedUUIDs = append(failedUUIDs, uuid)
+            continue
+        }
+        success++
+    }
+
+    return success, failed, failedUUIDs, nil
+}
+
 // CompleteTaskManually 员工手动点击完成任务
 func CompleteTaskManually(assignRecordsUUID string, taskAssigneeNum string) error {
 	// 第一步，查询指派记录，获取艺人编号

pb/bundle.proto

@@ -96,6 +96,7 @@ service Bundle {
   rpc TerminateTaskByUUID(TerminateTaskByUUIDRequest) returns (ComResponse) {} // 根据指派记录UUID终止任务（实际状态置为已中止）
   rpc GetTaskActualStatusByUUID(GetTaskActualStatusByUUIDRequest) returns (GetTaskActualStatusByUUIDResponse) {} // 根据指派记录UUID查询实际完成状态
   rpc BatchAssignTask(BatchAssignTaskRequest) returns (ComResponse) {}
+  rpc BatchTerminateTask(BatchTerminateTaskRequest) returns (ComResponse) {} // 批量终止任务（根据指派记录UUID列表）
   rpc GetArtistUploadStatsList(TaskQueryRequest) returns (ArtistUploadStatsResponse) {} // 艺人上传统计与额度列表
 
   rpc MetricsBusiness(MetricsBusinessReq) returns (MetricsBusinessResp) {}
@@ -1135,6 +1136,7 @@ message TaskQueryRequest {
   string sortBy = 4 [json_name = "sortBy"];    // 排序字段
   string sortType = 5 [json_name = "sortType"]; // 排序类型 asc/desc
   string lastTaskAssignee = 6 [json_name = "lastTaskAssignee"]; // 最近一次指派人筛选（模糊匹配）
+  repeated string subNums = 7 [json_name = "subNums"]; // 选中导出时的艺人编号集合（可选）
 }
 
 message TaskQueryResponse {
@@ -1274,6 +1276,11 @@ message TerminateTaskByUUIDRequest {
   string assignRecordsUUID = 1 [json_name = "assignRecordsUUID"]; // 指派记录UUID
 }
 
+// 批量终止任务请求（根据多个指派记录UUID）
+message BatchTerminateTaskRequest {
+  repeated string assignRecordsUUIDs = 1 [json_name = "assignRecordsUUIDs"]; // 指派记录UUID列表
+}
+
 // 根据指派记录UUID查询实际完成状态
 message GetTaskActualStatusByUUIDRequest {
   string assignRecordsUUID = 1 [json_name = "assignRecordsUUID"]; // 指派记录UUID

pb/bundle/bundle.validator.pb.go

@@ -7,8 +7,8 @@ import (
 	fmt "fmt"
 	math "math"
 	proto "github.com/golang/protobuf/proto"
-	_ "google.golang.org/protobuf/types/descriptorpb"
 	_ "github.com/mwitkow/go-proto-validators"
+	_ "google.golang.org/protobuf/types/descriptorpb"
 	github_com_mwitkow_go_proto_validators "github.com/mwitkow/go-proto-validators"
 )
 
@@ -571,6 +571,9 @@ func (this *CompleteTaskManuallyRequest) Validate() error {
 func (this *TerminateTaskByUUIDRequest) Validate() error {
 	return nil
 }
+func (this *BatchTerminateTaskRequest) Validate() error {
+	return nil
+}
 func (this *GetTaskActualStatusByUUIDRequest) Validate() error {
 	return nil
 }

pb/bundle/bundle_triple.pb.go

@@ -100,6 +100,7 @@ type BundleClient interface {
 	TerminateTaskByUUID(ctx context.Context, in *TerminateTaskByUUIDRequest, opts ...grpc_go.CallOption) (*ComResponse, common.ErrorWithAttachment)
 	GetTaskActualStatusByUUID(ctx context.Context, in *GetTaskActualStatusByUUIDRequest, opts ...grpc_go.CallOption) (*GetTaskActualStatusByUUIDResponse, common.ErrorWithAttachment)
 	BatchAssignTask(ctx context.Context, in *BatchAssignTaskRequest, opts ...grpc_go.CallOption) (*ComResponse, common.ErrorWithAttachment)
+	BatchTerminateTask(ctx context.Context, in *BatchTerminateTaskRequest, opts ...grpc_go.CallOption) (*ComResponse, common.ErrorWithAttachment)
 	GetArtistUploadStatsList(ctx context.Context, in *TaskQueryRequest, opts ...grpc_go.CallOption) (*ArtistUploadStatsResponse, common.ErrorWithAttachment)
 	MetricsBusiness(ctx context.Context, in *MetricsBusinessReq, opts ...grpc_go.CallOption) (*MetricsBusinessResp, common.ErrorWithAttachment)
 	MetricsOperatingCreate(ctx context.Context, in *MetricsOperatingCreateReq, opts ...grpc_go.CallOption) (*MetricsOperatingCreateResp, common.ErrorWithAttachment)
@@ -179,6 +180,7 @@ type BundleClientImpl struct {
 	TerminateTaskByUUID                      func(ctx context.Context, in *TerminateTaskByUUIDRequest) (*ComResponse, error)
 	GetTaskActualStatusByUUID                func(ctx context.Context, in *GetTaskActualStatusByUUIDRequest) (*GetTaskActualStatusByUUIDResponse, error)
 	BatchAssignTask                          func(ctx context.Context, in *BatchAssignTaskRequest) (*ComResponse, error)
+	BatchTerminateTask                       func(ctx context.Context, in *BatchTerminateTaskRequest) (*ComResponse, error)
 	GetArtistUploadStatsList                 func(ctx context.Context, in *TaskQueryRequest) (*ArtistUploadStatsResponse, error)
 	MetricsBusiness                          func(ctx context.Context, in *MetricsBusinessReq) (*MetricsBusinessResp, error)
 	MetricsOperatingCreate                   func(ctx context.Context, in *MetricsOperatingCreateReq) (*MetricsOperatingCreateResp, error)
@@ -590,6 +592,12 @@ func (c *bundleClient) BatchAssignTask(ctx context.Context, in *BatchAssignTaskR
 	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/BatchAssignTask", in, out)
 }
 
+func (c *bundleClient) BatchTerminateTask(ctx context.Context, in *BatchTerminateTaskRequest, opts ...grpc_go.CallOption) (*ComResponse, common.ErrorWithAttachment) {
+	out := new(ComResponse)
+	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
+	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/BatchTerminateTask", in, out)
+}
+
 func (c *bundleClient) GetArtistUploadStatsList(ctx context.Context, in *TaskQueryRequest, opts ...grpc_go.CallOption) (*ArtistUploadStatsResponse, common.ErrorWithAttachment) {
 	out := new(ArtistUploadStatsResponse)
 	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
@@ -708,6 +716,7 @@ type BundleServer interface {
 	TerminateTaskByUUID(context.Context, *TerminateTaskByUUIDRequest) (*ComResponse, error)
 	GetTaskActualStatusByUUID(context.Context, *GetTaskActualStatusByUUIDRequest) (*GetTaskActualStatusByUUIDResponse, error)
 	BatchAssignTask(context.Context, *BatchAssignTaskRequest) (*ComResponse, error)
+	BatchTerminateTask(context.Context, *BatchTerminateTaskRequest) (*ComResponse, error)
 	GetArtistUploadStatsList(context.Context, *TaskQueryRequest) (*ArtistUploadStatsResponse, error)
 	MetricsBusiness(context.Context, *MetricsBusinessReq) (*MetricsBusinessResp, error)
 	MetricsOperatingCreate(context.Context, *MetricsOperatingCreateReq) (*MetricsOperatingCreateResp, error)
@@ -918,6 +927,9 @@ func (UnimplementedBundleServer) GetTaskActualStatusByUUID(context.Context, *Get
 func (UnimplementedBundleServer) BatchAssignTask(context.Context, *BatchAssignTaskRequest) (*ComResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method BatchAssignTask not implemented")
 }
+func (UnimplementedBundleServer) BatchTerminateTask(context.Context, *BatchTerminateTaskRequest) (*ComResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method BatchTerminateTask not implemented")
+}
 func (UnimplementedBundleServer) GetArtistUploadStatsList(context.Context, *TaskQueryRequest) (*ArtistUploadStatsResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetArtistUploadStatsList not implemented")
 }
@@ -2852,6 +2864,35 @@ func _Bundle_BatchAssignTask_Handler(srv interface{}, ctx context.Context, dec f
 	return interceptor(ctx, in, info, handler)
 }
 
+func _Bundle_BatchTerminateTask_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
+	in := new(BatchTerminateTaskRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	base := srv.(dubbo3.Dubbo3GrpcService)
+	args := []interface{}{}
+	args = append(args, in)
+	md, _ := metadata.FromIncomingContext(ctx)
+	invAttachment := make(map[string]interface{}, len(md))
+	for k, v := range md {
+		invAttachment[k] = v
+	}
+	invo := invocation.NewRPCInvocation("BatchTerminateTask", args, invAttachment)
+	if interceptor == nil {
+		result := base.XXX_GetProxyImpl().Invoke(ctx, invo)
+		return result, result.Error()
+	}
+	info := &grpc_go.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: ctx.Value("XXX_TRIPLE_GO_INTERFACE_NAME").(string),
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		result := base.XXX_GetProxyImpl().Invoke(ctx, invo)
+		return result, result.Error()
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 func _Bundle_GetArtistUploadStatsList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
 	in := new(TaskQueryRequest)
 	if err := dec(in); err != nil {
@@ -3322,6 +3363,10 @@ var Bundle_ServiceDesc = grpc_go.ServiceDesc{
 			MethodName: "BatchAssignTask",
 			Handler:    _Bundle_BatchAssignTask_Handler,
 		},
+		{
+			MethodName: "BatchTerminateTask",
+			Handler:    _Bundle_BatchTerminateTask_Handler,
+		},
 		{
 			MethodName: "GetArtistUploadStatsList",
 			Handler:    _Bundle_GetArtistUploadStatsList_Handler,