Compare commits

..

No commits in common. "7ed326615fa58e25b0ac8bdefba6e757bd064b73" and "cdbca82323729c90337333f3c394d6be377e7d0d" have entirely different histories.

4 changed files with 951 additions and 964 deletions

View File

@ -498,21 +498,20 @@ func (b *BundleProvider) GetPendingUploadBreakdown(_ context.Context, req *bundl
return nil, err return nil, err
} }
respItems := make([]*bundle.PendingUploadBreakdownItem, 0, len(items)) respItems := make([]*bundle.PendingUploadBreakdownItem, 0, len(items))
for _, it := range items { for _, it := range items {
respItems = append(respItems, &bundle.PendingUploadBreakdownItem{ respItems = append(respItems, &bundle.PendingUploadBreakdownItem{
SubNum: it.SubNum, SubNum: it.SubNum,
TelNum: it.TelNum, ArtistName: it.UserName,
ArtistName: it.UserName, PendingVideoScriptCount: int32(it.PendingVideoScriptCount),
PendingVideoScriptCount: int32(it.PendingVideoScriptCount), PendingBundleVideoCount: int32(it.PendingBundleVideoCount),
PendingBundleVideoCount: int32(it.PendingBundleVideoCount), PendingIncreaseVideoCount: int32(it.PendingIncreaseVideoCount),
PendingIncreaseVideoCount: int32(it.PendingIncreaseVideoCount), PendingBundlePostCount: int32(it.PendingBundlePostCount),
PendingBundlePostCount: int32(it.PendingBundlePostCount), PendingIncreasePostCount: int32(it.PendingIncreasePostCount),
PendingIncreasePostCount: int32(it.PendingIncreasePostCount), PendingBundleDataCount: int32(it.PendingBundleDataCount),
PendingBundleDataCount: int32(it.PendingBundleDataCount), PendingIncreaseDataCount: int32(it.PendingIncreaseDataCount),
PendingIncreaseDataCount: int32(it.PendingIncreaseDataCount), })
}) }
} return &bundle.PendingUploadBreakdownResponse{Items: respItems}, nil
return &bundle.PendingUploadBreakdownResponse{Items: respItems}, nil
} }
func (b *BundleProvider) GetPendingTaskLayout(_ context.Context, _ *bundle.GetPendingTaskLayoutReq) (*bundle.GetPendingTaskLayoutResp, error) { func (b *BundleProvider) GetPendingTaskLayout(_ context.Context, _ *bundle.GetPendingTaskLayoutReq) (*bundle.GetPendingTaskLayoutResp, error) {

View File

@ -357,7 +357,6 @@ type ArtistUploadStatsItem struct {
type ArtistPendingUploadBreakdownItem struct { type ArtistPendingUploadBreakdownItem struct {
SubNum string `json:"subNum" gorm:"column:customer_num"` SubNum string `json:"subNum" gorm:"column:customer_num"`
TelNum string `json:"telNum" gorm:"column:tel_num"`
UserName string `json:"userName" gorm:"column:user_name"` UserName string `json:"userName" gorm:"column:user_name"`
PendingVideoScriptCount int `json:"pendingVideoScriptCount" gorm:"column:pending_video_script_count"` PendingVideoScriptCount int `json:"pendingVideoScriptCount" gorm:"column:pending_video_script_count"`
PendingBundleVideoCount int `json:"pendingBundleVideoCount" gorm:"column:pending_bundle_video_count"` PendingBundleVideoCount int `json:"pendingBundleVideoCount" gorm:"column:pending_bundle_video_count"`
@ -600,7 +599,6 @@ func GetPendingUploadBreakdownBySubNums(subNums []string) ([]*ArtistPendingUploa
selectFields := fmt.Sprintf(` selectFields := fmt.Sprintf(`
rn.name as user_name, rn.name as user_name,
u.tel_num as tel_num,
bor.customer_num, bor.customer_num,
GREATEST((%s) - (%s), 0) AS pending_video_script_count, GREATEST((%s) - (%s), 0) AS pending_video_script_count,
GREATEST((%s) - (%s) - (%s), 0) AS pending_bundle_video_count, GREATEST((%s) - (%s) - (%s), 0) AS pending_bundle_video_count,

View File

@ -1412,7 +1412,6 @@ message PendingUploadBreakdownItem {
int32 pendingIncreasePostCount = 7 [json_name = "pendingIncreasePostCount"]; int32 pendingIncreasePostCount = 7 [json_name = "pendingIncreasePostCount"];
int32 pendingBundleDataCount = 8 [json_name = "pendingBundleDataCount"]; int32 pendingBundleDataCount = 8 [json_name = "pendingBundleDataCount"];
int32 pendingIncreaseDataCount = 9 [json_name = "pendingIncreaseDataCount"]; int32 pendingIncreaseDataCount = 9 [json_name = "pendingIncreaseDataCount"];
string telNum = 10 [json_name = "telNum"];
} }
message PendingUploadBreakdownResponse { message PendingUploadBreakdownResponse {

File diff suppressed because it is too large Load Diff