From 5ecb8c5a3a564ad710be4ac91a794d754ac1f2b3 Mon Sep 17 00:00:00 2001 From: cjy Date: Sat, 29 Nov 2025 11:04:59 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AF=BC=E5=87=BA=E5=A2=9E=E5=8A=A04?= =?UTF-8?q?=E4=B8=AA=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/bundle/bundle.pb.go | 48 ++++++++++++++++++++++++++++-- pkg/service/taskbench/taskBench.go | 6 +++- 2 files changed, 51 insertions(+), 3 deletions(-) diff --git a/api/bundle/bundle.pb.go b/api/bundle/bundle.pb.go index 1e67f12..773e126 100644 --- a/api/bundle/bundle.pb.go +++ b/api/bundle/bundle.pb.go @@ -11693,6 +11693,11 @@ type ArtistUploadStatsItem struct { // 套餐时间 StartAt string `protobuf:"bytes,25,opt,name=startAt,proto3" json:"startAt"` ExpiredAt string `protobuf:"bytes,26,opt,name=expiredAt,proto3" json:"expiredAt"` + // 允许发（已预留/核销）数量 + AllowVideoCount int32 `protobuf:"varint,27,opt,name=allowVideoCount,proto3" json:"allowVideoCount"` + AllowPostCount int32 `protobuf:"varint,28,opt,name=allowPostCount,proto3" json:"allowPostCount"` + AllowDataCount int32 `protobuf:"varint,29,opt,name=allowDataCount,proto3" json:"allowDataCount"` + AllowVideoScriptCount int32 `protobuf:"varint,30,opt,name=allowVideoScriptCount,proto3" json:"allowVideoScriptCount"` } func (x *ArtistUploadStatsItem) Reset() { @@ -11909,6 +11914,34 @@ func (x *ArtistUploadStatsItem) GetExpiredAt() string { return "" } +func (x *ArtistUploadStatsItem) GetAllowVideoCount() int32 { + if x != nil { + return x.AllowVideoCount + } + return 0 +} + +func (x *ArtistUploadStatsItem) GetAllowPostCount() int32 { + if x != nil { + return x.AllowPostCount + } + return 0 +} + +func (x *ArtistUploadStatsItem) GetAllowDataCount() int32 { + if x != nil { + return x.AllowDataCount + } + return 0 +} + +func (x *ArtistUploadStatsItem) GetAllowVideoScriptCount() int32 { + if x != nil { + return x.AllowVideoScriptCount + } + return 0 +} + // 艺人上传与额度统计响应 type ArtistUploadStatsResponse struct { state protoimpl.MessageState @@ -16749,7 +16782,7 @@ var file_pb_bundle_proto_rawDesc = []byte{ 0x36, 0x0a, 0x16, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x44, 0x61, 0x74, 0x61, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x16, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x44, 0x61, - 0x74, 0x61, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0xc1, 0x09, 0x0a, 0x15, 0x41, 0x72, 0x74, 0x69, + 0x74, 0x61, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0xf1, 0x0a, 0x0a, 0x15, 0x41, 0x72, 0x74, 0x69, 0x73, 0x74, 0x55, 0x70, 0x6c, 0x6f, 0x61, 0x64, 0x53, 0x74, 0x61, 0x74, 0x73, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x75, 0x62, 0x4e, 0x75, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x75, 0x62, 0x4e, 0x75, 0x6d, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x72, 0x74, @@ -16825,7 +16858,18 @@ var file_pb_bundle_proto_rawDesc = []byte{ 0x75, 0x6e, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x74, 0x61, 0x72, 0x74, 0x41, 0x74, 0x18, 0x19, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x74, 0x61, 0x72, 0x74, 0x41, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x65, 0x78, 0x70, 0x69, 0x72, 0x65, 0x64, 0x41, 0x74, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x09, 0x65, 0x78, 0x70, 0x69, 0x72, 0x65, 0x64, 0x41, 0x74, 0x22, 0x96, 0x01, 0x0a, 0x19, + 0x52, 0x09, 0x65, 0x78, 0x70, 0x69, 0x72, 0x65, 0x64, 0x41, 0x74, 0x12, 0x28, 0x0a, 0x0f, 0x61, + 0x6c, 0x6c, 0x6f, 0x77, 0x56, 0x69, 0x64, 0x65, 0x6f, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x1b, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x0f, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x56, 0x69, 0x64, 0x65, 0x6f, + 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x26, 0x0a, 0x0e, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x50, 0x6f, + 0x73, 0x74, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x1c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0e, 0x61, + 0x6c, 0x6c, 0x6f, 0x77, 0x50, 0x6f, 0x73, 0x74, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x26, 0x0a, + 0x0e, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x44, 0x61, 0x74, 0x61, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, + 0x1d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0e, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x44, 0x61, 0x74, 0x61, + 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x34, 0x0a, 0x15, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x56, 0x69, + 0x64, 0x65, 0x6f, 0x53, 0x63, 0x72, 0x69, 0x70, 0x74, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x1e, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x15, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x56, 0x69, 0x64, 0x65, 0x6f, + 0x53, 0x63, 0x72, 0x69, 0x70, 0x74, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x96, 0x01, 0x0a, 0x19, 0x41, 0x72, 0x74, 0x69, 0x73, 0x74, 0x55, 0x70, 0x6c, 0x6f, 0x61, 0x64, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x33, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x62, 0x75, 0x6e, 0x64, 0x6c, diff --git a/pkg/service/taskbench/taskBench.go b/pkg/service/taskbench/taskBench.go index 060642b..a5bbb5e 100644 --- a/pkg/service/taskbench/taskBench.go +++ b/pkg/service/taskbench/taskBench.go @@ -569,7 +569,7 @@ func GetArtistUploadStatsListDownload(c *gin.Context) { } titleList := []string{ - "用户编号", "艺人", "手机号", "最近一次指派人", "可上传视频脚本数", "已上传视频脚本数", "可上传视频数", "已上传视频数", "已释放视频额度", "套餐视频总数", "增值视频总数", "可上传图文数", "已上传图文数", "已释放图文额度", "套餐图文总数", "增值图文总数", "可上传数据数", "已上传数据数", "已释放数据额度", "套餐数据总数", "增值数据总数", "进行中任务数", "已完成任务数", + "用户编号", "艺人", "手机号", "最近一次指派人", "可指派视频脚本数", "可上传视频脚本数", "已上传视频脚本数", "可指派视频数", "可上传视频数", "已上传视频数", "已释放视频额度", "套餐视频总数", "增值视频总数", "可指派图文数", "可上传图文数", "已上传图文数", "已释放图文额度", "套餐图文总数", "增值图文总数", "可指派数据数", "可上传数据数", "已上传数据数", "已释放数据额度", "套餐数据总数", "增值数据总数", "进行中任务数", "已完成任务数", } var dataList []interface{} @@ -579,18 +579,22 @@ func GetArtistUploadStatsListDownload(c *gin.Context) { i.ArtistName, i.TelNum, i.LastTaskAssignee, + i.AllowVideoScriptCount, i.PendingVideoScriptCount, i.UploadedVideoScriptCount, + i.AllowVideoCount, i.PendingVideoCount, i.UploadedVideoCount, i.ReleasedVideoTotal, i.BundleVideoTotal, i.IncreaseVideoTotal, + i.AllowPostCount, i.PendingPostCount, i.UploadedPostCount, i.ReleasedPostTotal, i.BundlePostTotal, i.IncreasePostTotal, + i.AllowDataCount, i.PendingDataAnalysisCount, i.UploadedDataAnalysisCount, i.ReleasedDataAnalysisTotal,