Merge branch 'feat-cjy-taskBench2'

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

api/bundle/bundle.validator.pb.go

@@ -652,6 +652,22 @@ func (this *PendingUploadBreakdownResponse) Validate() error {
 	}
 	return nil
 }
+func (this *PendingAssignRequest) Validate() error {
+	return nil
+}
+func (this *PendingAssignItem) Validate() error {
+	return nil
+}
+func (this *PendingAssignResponse) Validate() error {
+	for _, item := range this.Items {
+		if item != nil {
+			if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
+				return github_com_mwitkow_go_proto_validators.FieldError("Items", err)
+			}
+		}
+	}
+	return nil
+}
 func (this *ArtistBundleBalanceRequest) Validate() error {
 	return nil
 }

api/bundle/bundle_triple.pb.go

@@ -105,6 +105,7 @@ type BundleClient interface {
 	GetPendingTaskLayout(ctx context.Context, in *GetPendingTaskLayoutReq, opts ...grpc_go.CallOption) (*GetPendingTaskLayoutResp, common.ErrorWithAttachment)
 	SetPendingTaskLayout(ctx context.Context, in *SetPendingTaskLayoutReq, opts ...grpc_go.CallOption) (*SetPendingTaskLayoutResp, common.ErrorWithAttachment)
 	GetPendingUploadBreakdown(ctx context.Context, in *PendingUploadBreakdownRequest, opts ...grpc_go.CallOption) (*PendingUploadBreakdownResponse, common.ErrorWithAttachment)
+	GetPendingAssign(ctx context.Context, in *PendingAssignRequest, opts ...grpc_go.CallOption) (*PendingAssignResponse, common.ErrorWithAttachment)
 	RevertTaskCompletionByUUIDItem(ctx context.Context, in *RevertTaskCompletionByUUIDItemRequest, opts ...grpc_go.CallOption) (*ComResponse, common.ErrorWithAttachment)
 	AddHiddenTaskAssignee(ctx context.Context, in *AddHiddenTaskAssigneeRequest, opts ...grpc_go.CallOption) (*ComResponse, common.ErrorWithAttachment)
 	// 数据指标
@@ -191,6 +192,7 @@ type BundleClientImpl struct {
 	GetPendingTaskLayout                     func(ctx context.Context, in *GetPendingTaskLayoutReq) (*GetPendingTaskLayoutResp, error)
 	SetPendingTaskLayout                     func(ctx context.Context, in *SetPendingTaskLayoutReq) (*SetPendingTaskLayoutResp, error)
 	GetPendingUploadBreakdown                func(ctx context.Context, in *PendingUploadBreakdownRequest) (*PendingUploadBreakdownResponse, error)
+	GetPendingAssign                         func(ctx context.Context, in *PendingAssignRequest) (*PendingAssignResponse, error)
 	RevertTaskCompletionByUUIDItem           func(ctx context.Context, in *RevertTaskCompletionByUUIDItemRequest) (*ComResponse, error)
 	AddHiddenTaskAssignee                    func(ctx context.Context, in *AddHiddenTaskAssigneeRequest) (*ComResponse, error)
 	MetricsBusiness                          func(ctx context.Context, in *MetricsBusinessReq) (*MetricsBusinessResp, error)
@@ -633,6 +635,12 @@ func (c *bundleClient) GetPendingUploadBreakdown(ctx context.Context, in *Pendin
 	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/GetPendingUploadBreakdown", in, out)
 }
 
+func (c *bundleClient) GetPendingAssign(ctx context.Context, in *PendingAssignRequest, opts ...grpc_go.CallOption) (*PendingAssignResponse, common.ErrorWithAttachment) {
+	out := new(PendingAssignResponse)
+	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
+	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/GetPendingAssign", in, out)
+}
+
 func (c *bundleClient) RevertTaskCompletionByUUIDItem(ctx context.Context, in *RevertTaskCompletionByUUIDItemRequest, opts ...grpc_go.CallOption) (*ComResponse, common.ErrorWithAttachment) {
 	out := new(ComResponse)
 	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
@@ -762,6 +770,7 @@ type BundleServer interface {
 	GetPendingTaskLayout(context.Context, *GetPendingTaskLayoutReq) (*GetPendingTaskLayoutResp, error)
 	SetPendingTaskLayout(context.Context, *SetPendingTaskLayoutReq) (*SetPendingTaskLayoutResp, error)
 	GetPendingUploadBreakdown(context.Context, *PendingUploadBreakdownRequest) (*PendingUploadBreakdownResponse, error)
+	GetPendingAssign(context.Context, *PendingAssignRequest) (*PendingAssignResponse, error)
 	RevertTaskCompletionByUUIDItem(context.Context, *RevertTaskCompletionByUUIDItemRequest) (*ComResponse, error)
 	AddHiddenTaskAssignee(context.Context, *AddHiddenTaskAssigneeRequest) (*ComResponse, error)
 	// 数据指标
@@ -989,6 +998,9 @@ func (UnimplementedBundleServer) SetPendingTaskLayout(context.Context, *SetPendi
 func (UnimplementedBundleServer) GetPendingUploadBreakdown(context.Context, *PendingUploadBreakdownRequest) (*PendingUploadBreakdownResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetPendingUploadBreakdown not implemented")
 }
+func (UnimplementedBundleServer) GetPendingAssign(context.Context, *PendingAssignRequest) (*PendingAssignResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GetPendingAssign not implemented")
+}
 func (UnimplementedBundleServer) RevertTaskCompletionByUUIDItem(context.Context, *RevertTaskCompletionByUUIDItemRequest) (*ComResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method RevertTaskCompletionByUUIDItem not implemented")
 }
@@ -3071,6 +3083,35 @@ func _Bundle_GetPendingUploadBreakdown_Handler(srv interface{}, ctx context.Cont
 	return interceptor(ctx, in, info, handler)
 }
 
+func _Bundle_GetPendingAssign_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
+	in := new(PendingAssignRequest)
+	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("GetPendingAssign", 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_RevertTaskCompletionByUUIDItem_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
 	in := new(RevertTaskCompletionByUUIDItemRequest)
 	if err := dec(in); err != nil {
@@ -3590,6 +3631,10 @@ var Bundle_ServiceDesc = grpc_go.ServiceDesc{
 			MethodName: "GetPendingUploadBreakdown",
 			Handler:    _Bundle_GetPendingUploadBreakdown_Handler,
 		},
+		{
+			MethodName: "GetPendingAssign",
+			Handler:    _Bundle_GetPendingAssign_Handler,
+		},
 		{
 			MethodName: "RevertTaskCompletionByUUIDItem",
 			Handler:    _Bundle_RevertTaskCompletionByUUIDItem_Handler,

pkg/router/taskBench.go

@@ -76,6 +76,9 @@ func TaskBenchRouter(r *gin.RouterGroup) {
 
 		// 添加隐藏任务指派人
 		taskBenchRoute.POST("hide", taskbench.AddHiddenTaskAssignee)
+
+		// 查询待指派数据
+		taskBenchRoute.POST("pending-data-list", taskbench.GetPendingAssign)
 	}
 
 	// 员工任务相关路由（需要App登录验证）

pkg/service/taskbench/taskBench.go

@@ -679,3 +679,19 @@ func UpdateVideoScriptWithUUID(ctx *gin.Context) {
 	service.Success(ctx, resp)
 	return
 }
+
+func GetPendingAssign(c *gin.Context) {
+	var req bundle.PendingAssignRequest
+	if err := c.ShouldBindJSON(&req); err != nil {
+		service.Error(c, err)
+		return
+	}
+
+	res, err := service.BundleProvider.GetPendingAssign(context.Background(), &req)
+	if err != nil {
+		service.Error(c, err)
+		return
+	}
+
+	service.Success(c, res)
+}