Updata：解决冲突
This commit is contained in:
jiaji.H
commit
a80da48ed0
@ -191,6 +191,7 @@ func MetricsBusiness(req *bundle.MetricsBusinessReq) (result *bundle.MetricsBusi
|
||||
Where("cwe.cost_type = 1").
|
||||
Where("cwl.update_time >= ?", req.Start+" 00:00:00").
|
||||
Where("cwl.update_time <= ?", req.End+" 23:59:59").
|
||||
Where("cast_work.origin_uuid = ''").
|
||||
Where("cast_work.deleted_at = 0 and ccl.deleted_at = 0 and cwe.deleted_at = 0")
|
||||
if req.BundleUuid != "" {
|
||||
query = query.Where("ccl.bundle_uuid = ?", req.BundleUuid)
|
||||
@ -209,6 +210,7 @@ func MetricsBusiness(req *bundle.MetricsBusinessReq) (result *bundle.MetricsBusi
|
||||
Where("cwe.cost_type != 1").
|
||||
Where("cwl.update_time >= ?", req.Start+" 00:00:00").
|
||||
Where("cwl.update_time <= ?", req.End+" 23:59:59").
|
||||
Where("cast_work.origin_uuid = ''").
|
||||
Where("cast_work.deleted_at = 0 and ccl.deleted_at = 0 and cwe.deleted_at = 0")
|
||||
if req.BundleUuid != "" {
|
||||
query = query.Where("ccl.bundle_uuid = ?", req.BundleUuid)
|
||||
@ -240,6 +242,7 @@ func MetricsBusiness(req *bundle.MetricsBusinessReq) (result *bundle.MetricsBusi
|
||||
Where("cw.status in ?", []int{7, 6, 9}).
|
||||
Where("cwl.update_time >= ?", req.Start+" 00:00:00").
|
||||
Where("cwl.update_time <= ?", req.End+" 23:59:59").
|
||||
Where("cw.origin_uuid = ''").
|
||||
Where("cw.deleted_at = 0 and cwl.deleted_at = 0 and cwe.deleted_at = 0").
|
||||
Group("cw.artist_uuid")
|
||||
|
||||
@ -302,6 +305,7 @@ func MetricsBusiness(req *bundle.MetricsBusinessReq) (result *bundle.MetricsBusi
|
||||
Where("cast_work.work_category = 2").
|
||||
Where("cast_work.submit_time >= ?", req.Start+" 00:00:00").
|
||||
Where("cast_work.submit_time <= ?", req.End+" 23:59:59").
|
||||
Where("cast_work.origin_uuid = ''").
|
||||
Where("cast_work.deleted_at = 0")
|
||||
|
||||
if req.BundleUuid != "" {
|
||||
@ -322,6 +326,7 @@ func MetricsBusiness(req *bundle.MetricsBusinessReq) (result *bundle.MetricsBusi
|
||||
Where("cast_work.work_category = 2").
|
||||
Where("cast_work.submit_time >= ?", req.Start+" 00:00:00").
|
||||
Where("cast_work.submit_time <= ?", req.End+" 23:59:59").
|
||||
Where("cast_work.origin_uuid = ''").
|
||||
Where("cast_work.deleted_at = 0 and bor.deleted_at IS NULL and bb.deleted_at IS NULL").
|
||||
Where("bor.bundle_uuid = ?", req.BundleUuid)
|
||||
err = query.Count(&newVideoUsed).Error
|
||||
@ -337,6 +342,7 @@ func MetricsBusiness(req *bundle.MetricsBusinessReq) (result *bundle.MetricsBusi
|
||||
Where("cast_work.submit_time <= ?", req.End+" 23:59:59").
|
||||
Where("cast_work.work_category = 2"). // 视频类型
|
||||
Where("cwe.cost_type = 1"). // 套餐类型
|
||||
Where("cast_work.origin_uuid = ''").
|
||||
Where("cast_work.deleted_at = 0")
|
||||
if req.BundleUuid != "" {
|
||||
queryBundleVideo = queryBundleVideo.Where("ccl.bundle_uuid = ?", req.BundleUuid)
|
||||
@ -353,6 +359,7 @@ func MetricsBusiness(req *bundle.MetricsBusinessReq) (result *bundle.MetricsBusi
|
||||
Where("cast_work.submit_time <= ?", req.End+" 23:59:59").
|
||||
Where("cast_work.work_category = 2"). // 视频类型
|
||||
Where("cwe.cost_type in ?", []int{2, 3}). // 增值类型
|
||||
Where("cast_work.origin_uuid = ''").
|
||||
Where("cast_work.deleted_at = 0")
|
||||
if req.BundleUuid != "" {
|
||||
queryIncreaseVideo = queryIncreaseVideo.Where("ccl.bundle_uuid = ?", req.BundleUuid)
|
||||
@ -436,6 +443,7 @@ func MetricsBusiness(req *bundle.MetricsBusinessReq) (result *bundle.MetricsBusi
|
||||
Where("cast_work.work_category = 1").
|
||||
Where("cast_work.submit_time >= ?", req.Start+" 00:00:00").
|
||||
Where("cast_work.submit_time <= ?", req.End+" 23:59:59").
|
||||
Where("cast_work.origin_uuid = ''").
|
||||
Where("cast_work.deleted_at = 0")
|
||||
|
||||
if req.BundleUuid != "" {
|
||||
@ -455,6 +463,7 @@ func MetricsBusiness(req *bundle.MetricsBusinessReq) (result *bundle.MetricsBusi
|
||||
Where("cast_work.work_category = 1").
|
||||
Where("cast_work.submit_time >= ?", req.Start+" 00:00:00").
|
||||
Where("cast_work.submit_time <= ?", req.End+" 23:59:59").
|
||||
Where("cast_work.origin_uuid = ''").
|
||||
Where("cast_work.deleted_at = 0 and bor.deleted_at IS NULL and bb.deleted_at IS NULL").
|
||||
Where("bor.bundle_uuid = ?", req.BundleUuid)
|
||||
err = query.Count(&newImageUsed).Error
|
||||
@ -470,6 +479,7 @@ func MetricsBusiness(req *bundle.MetricsBusinessReq) (result *bundle.MetricsBusi
|
||||
Where("cast_work.submit_time <= ?", req.End+" 23:59:59").
|
||||
Where("cast_work.work_category = 1"). // 图文类型
|
||||
Where("cwe.cost_type = 1 "). // 套餐类型
|
||||
Where("cast_work.origin_uuid = ''").
|
||||
Where("cast_work.deleted_at = 0")
|
||||
if req.BundleUuid != "" {
|
||||
queryBundleImage = queryBundleImage.Where("ccl.bundle_uuid = ?", req.BundleUuid)
|
||||
@ -486,6 +496,7 @@ func MetricsBusiness(req *bundle.MetricsBusinessReq) (result *bundle.MetricsBusi
|
||||
Where("cast_work.submit_time <= ?", req.End+" 23:59:59").
|
||||
Where("cast_work.work_category = 1"). // 图文类型
|
||||
Where("cwe.cost_type in ?", []int{2, 3}). // 增值类型
|
||||
Where("cast_work.origin_uuid = ''").
|
||||
Where("cast_work.deleted_at = 0")
|
||||
if req.BundleUuid != "" {
|
||||
queryIncreaseImage = queryIncreaseImage.Where("ccl.bundle_uuid = ?", req.BundleUuid)
|
||||
@ -502,16 +513,15 @@ func MetricsBusiness(req *bundle.MetricsBusinessReq) (result *bundle.MetricsBusi
|
||||
UnUsedDataAnalysis int64 `gorm:"column:un_used_data_analysis"`
|
||||
}
|
||||
var dataAnalysisCountInfo DataAnalysisCountResult
|
||||
query = app.ModuleClients.BundleDB.Model(&model.CastWork{}).
|
||||
query = app.ModuleClients.BundleDB.Table("cast_work_analysis as cwa").
|
||||
Select(`
|
||||
SUM(CASE WHEN ccl.uuid IS NOT NULL AND ccl.deleted_at = 0 THEN 1 ELSE 0 END) AS data_analysis_used,
|
||||
SUM(CASE WHEN ccl.uuid IS NULL THEN 1 ELSE 0 END) AS un_used_data_analysis
|
||||
SUM(CASE WHEN ccal.uuid IS NOT NULL AND ccal.deleted_at = 0 THEN 1 ELSE 0 END) AS data_analysis_used,
|
||||
SUM(CASE WHEN ccal.uuid IS NULL THEN 1 ELSE 0 END) AS un_used_data_analysis
|
||||
`).
|
||||
Joins("left join cast_cost_log ccl on ccl.work_uuid = cast_work.uuid").
|
||||
Where("cast_work.work_category = 3").
|
||||
Where("cast_work.submit_time >= ?", req.Start+" 00:00:00").
|
||||
Where("cast_work.submit_time <= ?", req.End+" 23:59:59").
|
||||
Where("cast_work.deleted_at = 0")
|
||||
Joins("left join cast_cost_analysis_log ccal on ccal.analysis_uuid = cwa.uuid").
|
||||
Where("cwa.submit_time >= ?", req.Start+" 00:00:00").
|
||||
Where("cwa.submit_time <= ?", req.End+" 23:59:59").
|
||||
Where("cwa.deleted_at = 0")
|
||||
if req.BundleUuid != "" {
|
||||
query = query.Where("ccl.bundle_uuid = ?", req.BundleUuid)
|
||||
}
|
||||
@ -523,46 +533,43 @@ func MetricsBusiness(req *bundle.MetricsBusinessReq) (result *bundle.MetricsBusi
|
||||
if req.BundleUuid == "" {
|
||||
newDataAnalysisUsed = dataAnalysisCountInfo.DataAnalysisUsed + dataAnalysisCountInfo.UnUsedDataAnalysis
|
||||
} else {
|
||||
query = app.ModuleClients.BundleDB.Model(&model.CastWork{}).
|
||||
Joins("left join bundle_balance bb ON CAST(bb.user_id AS CHAR) COLLATE utf8mb4_general_ci = cast_work.artist_uuid COLLATE utf8mb4_general_ci AND cast_work.submit_time >= bb.start_at AND cast_work.submit_time <= bb.expired_at and bb.month = DATE_FORMAT(cast_work.submit_time, '%Y-%m')").
|
||||
query = app.ModuleClients.BundleDB.Table("cast_work_analysis as cwa").
|
||||
Joins("left join bundle_balance bb ON CAST(bb.user_id AS CHAR) COLLATE utf8mb4_general_ci = cwa.artist_id COLLATE utf8mb4_general_ci AND cwa.submit_time >= bb.start_at AND cwa.submit_time <= bb.expired_at and bb.month = DATE_FORMAT(cwa.submit_time, '%Y-%m')").
|
||||
Joins("left join bundle_order_records bor ON bor.uuid = bb.order_uuid").
|
||||
Where("cast_work.work_category = 3").
|
||||
Where("cast_work.submit_time >= ?", req.Start+" 00:00:00").
|
||||
Where("cast_work.submit_time <= ?", req.End+" 23:59:59").
|
||||
Where("cast_work.deleted_at = 0 and bor.deleted_at IS NULL and bb.deleted_at IS NULL").
|
||||
Where("cwa.submit_time >= ?", req.Start+" 00:00:00").
|
||||
Where("cwa.submit_time <= ?", req.End+" 23:59:59").
|
||||
Where("cwa.deleted_at = 0 and bor.deleted_at IS NULL and bb.deleted_at IS NULL").
|
||||
Where("bor.bundle_uuid = ?", req.BundleUuid)
|
||||
err = query.Count(&newDataAnalysisUsed).Error
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
//数据分析套餐总已上传数
|
||||
var totalUploadedBundleDataAnalysisCount int64
|
||||
queryBundleDataAnalysis := app.ModuleClients.BundleDB.Model(&model.CastWork{}).
|
||||
Joins("left join cast_work_extra cwe on cwe.work_uuid = cast_work.uuid").
|
||||
Joins("left join cast_cost_log ccl on ccl.work_uuid = cast_work.uuid AND ccl.deleted_at = 0").
|
||||
Where("cast_work.submit_time <= ?", req.End+" 23:59:59").
|
||||
Where("cast_work.work_category = 3"). // 数据分析类型
|
||||
Where("cwe.cost_type = 1"). // 套餐类型
|
||||
Where("cast_work.deleted_at = 0")
|
||||
queryBundleDataAnalysis := app.ModuleClients.BundleDB.Table("cast_work_analysis as cwa").
|
||||
Joins("left join cast_work_analysis_extra cwae on cwae.analysis_uuid = cwa.uuid AND cwae.deleted_at = 0").
|
||||
Joins("left join cast_cost_analysis_log ccal on ccal.analysis_uuid = cwa.uuid AND ccal.deleted_at = 0").
|
||||
Where("cwa.submit_time <= ?", req.End+" 23:59:59").
|
||||
Where("cwae.cost_type = 1"). // 套餐类型
|
||||
Where("cwa.deleted_at = 0")
|
||||
if req.BundleUuid != "" {
|
||||
queryBundleDataAnalysis = queryBundleDataAnalysis.Where("ccl.bundle_uuid = ?", req.BundleUuid)
|
||||
queryBundleDataAnalysis = queryBundleDataAnalysis.Where("ccal.bundle_uuid = ?", req.BundleUuid)
|
||||
}
|
||||
err = queryBundleDataAnalysis.Count(&totalUploadedBundleDataAnalysisCount).Error
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
//数据分析增值总已上传数
|
||||
var totalUploadedIncreaseDataAnalysisCount int64
|
||||
queryIncreaseDataAnalysis := app.ModuleClients.BundleDB.Model(&model.CastWork{}).
|
||||
Joins("left join cast_work_extra cwe on cwe.work_uuid = cast_work.uuid AND cwe.deleted_at = 0").
|
||||
Joins("left join cast_cost_log ccl on ccl.work_uuid = cast_work.uuid AND ccl.deleted_at = 0").
|
||||
Where("cast_work.submit_time <= ?", req.End+" 23:59:59").
|
||||
Where("cast_work.work_category = 3"). // 数据分析类型
|
||||
Where("cwe.cost_type in ?", []int{2, 3}). // 增值类型
|
||||
Where("cast_work.deleted_at = 0")
|
||||
queryIncreaseDataAnalysis := app.ModuleClients.BundleDB.Table("cast_work_analysis as cwa").
|
||||
Joins("left join cast_work_analysis_extra cwae on cwae.analysis_uuid = cwa.uuid AND cwae.deleted_at = 0").
|
||||
Joins("left join cast_cost_analysis_log ccal on ccal.analysis_uuid = cwa.uuid AND ccal.deleted_at = 0").
|
||||
Where("cwa.submit_time <= ?", req.End+" 23:59:59").
|
||||
Where("cwae.cost_type in ?", []int{2, 3}). // 增值类型
|
||||
Where("cwa.deleted_at = 0")
|
||||
if req.BundleUuid != "" {
|
||||
queryIncreaseDataAnalysis = queryIncreaseDataAnalysis.Where("ccl.bundle_uuid = ?", req.BundleUuid)
|
||||
queryIncreaseDataAnalysis = queryIncreaseDataAnalysis.Where("ccal.bundle_uuid = ?", req.BundleUuid)
|
||||
}
|
||||
err = queryIncreaseDataAnalysis.Count(&totalUploadedIncreaseDataAnalysisCount).Error
|
||||
if err != nil {
|
||||
@ -645,7 +652,7 @@ func MetricsOperatingCreate(req *bundle.MetricsOperatingCreateReq) (result *bund
|
||||
Where("cast_work.submit_time >= ?", req.Start+" 00:00:00").
|
||||
Where("cast_work.submit_time <= ?", req.End+" 23:59:59").
|
||||
Where("work_category = 2"). // 视频类型
|
||||
Where("deleted_at = 0").
|
||||
Where("cast_work.origin_uuid = ''").
|
||||
// Where("cwe.cost_type = 1"). // 套餐类型
|
||||
Where("deleted_at = 0").
|
||||
Count(&newUploadedBundleVideoCount)
|
||||
@ -666,7 +673,7 @@ func MetricsOperatingCreate(req *bundle.MetricsOperatingCreateReq) (result *bund
|
||||
// Joins("left join cast_work_extra cwe on cwe.work_uuid = cast_work.uuid").
|
||||
Where("cast_work.submit_time <= ?", req.End+" 23:59:59").
|
||||
Where("work_category = 2"). // 视频类型
|
||||
Where("deleted_at = 0").
|
||||
Where("cast_work.origin_uuid = ''").
|
||||
// Where("cwe.cost_type = 1"). // 套餐类型
|
||||
Where("deleted_at = 0").
|
||||
Count(&totalUploadedVideoCount)
|
||||
@ -678,6 +685,7 @@ func MetricsOperatingCreate(req *bundle.MetricsOperatingCreateReq) (result *bund
|
||||
Where("cast_work.submit_time <= ?", req.End+" 23:59:59").
|
||||
Where("work_category = 2"). // 视频类型
|
||||
Where("cwe.cost_type = 1"). // 套餐类型
|
||||
Where("cast_work.origin_uuid = ''").
|
||||
Where("cast_work.deleted_at = 0 and cwe.deleted_at = 0").
|
||||
Count(&totalUploadedBundleVideoCount)
|
||||
|
||||
@ -687,6 +695,7 @@ func MetricsOperatingCreate(req *bundle.MetricsOperatingCreateReq) (result *bund
|
||||
Where("cast_work.submit_time <= ?", req.End+" 23:59:59").
|
||||
Where("work_category = 2"). // 视频类型
|
||||
Where("cwe.cost_type in ?", []int{2, 3}). // 增值类型或扩展类型
|
||||
Where("cast_work.origin_uuid = ''").
|
||||
Where("cast_work.deleted_at = 0 and cwe.deleted_at = 0").
|
||||
Count(&totalUploadedIncreaseVideoCount)
|
||||
|
||||
@ -714,7 +723,7 @@ func MetricsOperatingCreate(req *bundle.MetricsOperatingCreateReq) (result *bund
|
||||
Where("cast_work.submit_time >= ?", req.Start+" 00:00:00").
|
||||
Where("cast_work.submit_time <= ?", req.End+" 23:59:59").
|
||||
Where("work_category = 1"). // 图文类型
|
||||
Where("deleted_at = 0").
|
||||
Where("cast_work.origin_uuid = ''").
|
||||
// Where("cwe.cost_type = 1"). // 套餐类型
|
||||
Where("deleted_at = 0").
|
||||
Count(&newUploadedBundleImageCount)
|
||||
@ -735,7 +744,7 @@ func MetricsOperatingCreate(req *bundle.MetricsOperatingCreateReq) (result *bund
|
||||
// Joins("left join cast_work_extra cwe on cwe.work_uuid = cast_work.uuid").
|
||||
Where("cast_work.submit_time <= ?", req.End+" 23:59:59").
|
||||
Where("work_category = 1"). // 图文类型
|
||||
Where("deleted_at = 0").
|
||||
Where("cast_work.origin_uuid = ''").
|
||||
// Where("cwe.cost_type = 2"). // 套餐类型
|
||||
Where("deleted_at = 0").
|
||||
Count(&totalUploadedImageCount)
|
||||
@ -747,6 +756,7 @@ func MetricsOperatingCreate(req *bundle.MetricsOperatingCreateReq) (result *bund
|
||||
Where("cast_work.submit_time <= ?", req.End+" 23:59:59").
|
||||
Where("work_category = 1"). // 图文类型
|
||||
Where("cwe.cost_type = 1"). // 套餐类型
|
||||
Where("cast_work.origin_uuid = ''").
|
||||
Where("cast_work.deleted_at = 0 and cwe.deleted_at = 0").
|
||||
Count(&totalUploadedBundleImageCount)
|
||||
|
||||
@ -756,43 +766,40 @@ func MetricsOperatingCreate(req *bundle.MetricsOperatingCreateReq) (result *bund
|
||||
Where("cast_work.submit_time <= ?", req.End+" 23:59:59").
|
||||
Where("work_category = 1"). // 图文类型
|
||||
Where("cwe.cost_type in ?", []int{2, 3}). // 增值类型
|
||||
Where("cast_work.origin_uuid = ''").
|
||||
Where("cast_work.deleted_at = 0 and cwe.deleted_at = 0").
|
||||
Count(&totalUploadedIncreaseImageCount)
|
||||
|
||||
//====================数据分析=======================
|
||||
var newUploadedBundleDataAnalysisCount int64
|
||||
app.ModuleClients.BundleDB.Model(&model.CastWork{}).
|
||||
Where("cast_work.submit_time >= ?", req.Start+" 00:00:00").
|
||||
Where("cast_work.submit_time <= ?", req.End+" 23:59:59").
|
||||
Where("work_category = 3"). // 数据分析类型
|
||||
Where("deleted_at = 0").
|
||||
app.ModuleClients.BundleDB.Table("cast_work_analysis as cwa").
|
||||
Where("cwa.submit_time >= ?", req.Start+" 00:00:00").
|
||||
Where("cwa.submit_time <= ?", req.End+" 23:59:59").
|
||||
Where("cwa.deleted_at = 0").
|
||||
Count(&newUploadedBundleDataAnalysisCount)
|
||||
result.NewUploadedBundleDataAnalysisCount = newUploadedBundleDataAnalysisCount
|
||||
|
||||
var totalUploadedDataAnalysisCount int64
|
||||
app.ModuleClients.BundleDB.Model(&model.CastWork{}).
|
||||
Where("cast_work.submit_time <= ?", req.End+" 23:59:59").
|
||||
Where("work_category = 3"). // 数据分析类型
|
||||
Where("deleted_at = 0").
|
||||
app.ModuleClients.BundleDB.Table("cast_work_analysis as cwa").
|
||||
Where("cwa.submit_time <= ?", req.End+" 23:59:59").
|
||||
Where("cwa.deleted_at = 0").
|
||||
Count(&totalUploadedDataAnalysisCount)
|
||||
result.TotalUploadedBundleDataAnalysisCount = totalUploadedDataAnalysisCount
|
||||
|
||||
var totalUploadedBundleDataAnalysisCount int64
|
||||
app.ModuleClients.BundleDB.Model(&model.CastWork{}).
|
||||
Joins("left join cast_work_extra cwe on cwe.work_uuid = cast_work.uuid").
|
||||
Where("cast_work.submit_time <= ?", req.End+" 23:59:59").
|
||||
Where("work_category = 3"). // 数据分析类型
|
||||
Where("cwe.cost_type = 1"). // 套餐类型
|
||||
Where("cast_work.deleted_at = 0 and cwe.deleted_at = 0").
|
||||
app.ModuleClients.BundleDB.Table("cast_work_analysis as cwa").
|
||||
Joins("left join cast_work_analysis_extra cwae on cwae.analysis_uuid = cwa.uuid AND cwae.deleted_at = 0").
|
||||
Where("cwa.submit_time <= ?", req.End+" 23:59:59").
|
||||
Where("cwae.cost_type = 1"). // 套餐类型
|
||||
Where("cwa.deleted_at = 0 and cwae.deleted_at = 0").
|
||||
Count(&totalUploadedBundleDataAnalysisCount)
|
||||
|
||||
var totalUploadedIncreaseDataAnalysisCount int64
|
||||
app.ModuleClients.BundleDB.Model(&model.CastWork{}).
|
||||
Joins("left join cast_work_extra cwe on cwe.work_uuid = cast_work.uuid AND cwe.deleted_at = 0").
|
||||
Where("cast_work.submit_time <= ?", req.End+" 23:59:59").
|
||||
Where("work_category = 3"). // 数据分析类型
|
||||
Where("cwe.cost_type in ?", []int{2, 3}). // 增值类型
|
||||
Where("cast_work.deleted_at = 0 and cwe.deleted_at = 0").
|
||||
app.ModuleClients.BundleDB.Table("cast_work_analysis as cwa").
|
||||
Joins("left join cast_work_analysis_extra cwae on cwae.analysis_uuid = cwa.uuid AND cwae.deleted_at = 0").
|
||||
Where("cwa.submit_time <= ?", req.End+" 23:59:59").
|
||||
Where("cwae.cost_type in ?", []int{2, 3}). // 增值类型
|
||||
Where("cwa.deleted_at = 0 and cwe.deleted_at = 0").
|
||||
Count(&totalUploadedIncreaseDataAnalysisCount)
|
||||
|
||||
endMonth := timeParse(req.End + " 23:59:59").Format("2006-01")
|
||||
@ -1189,7 +1196,33 @@ func MetricsOperatingStatus(req *bundle.MetricsOperatingStatusReq) (data *bundle
|
||||
Where("cast_work.submit_time <= ?", req.Date+" 23:59:59").
|
||||
Where("cwl.deleted_at = 0 and ccl.deleted_at = 0 and cast_work.deleted_at = 0").
|
||||
Count(&data.AutoConfirmImageCount)
|
||||
//======================数据分析暂时未做======================
|
||||
//======================数据分析======================
|
||||
var analysisStatistic = func(status int8) (i int64) {
|
||||
app.ModuleClients.BundleDB.Table("cast_work_analysis").Where("status = ?", status).Where("deleted_at = 0 and submit_time <= ?", req.Date+" 23:59:59").Count(&i)
|
||||
return
|
||||
}
|
||||
data.ReviewingDataAnalysisCount = analysisStatistic(2)
|
||||
data.RejectDataAnalysisCount = analysisStatistic(3)
|
||||
data.WaitConfirmDataAnalysisCount = analysisStatistic(4)
|
||||
data.PendingUploadDataAnalysisCount = analysisStatistic(6)
|
||||
data.UploadSuccessDataAnalysisCount = analysisStatistic(7)
|
||||
data.UploadFailedDataAnalysisCount = analysisStatistic(5)
|
||||
|
||||
app.ModuleClients.BundleDB.Table("cast_work_analysis").
|
||||
Joins("left join cast_cost_analysis_log ccal on ccal.analysis_uuid = cast_work_analysis.uuid AND ccal.deleted_at = 0").
|
||||
Where("cast_work_analysis.status in ?", []int{6, 7}).
|
||||
Where("cast_work_analysis.deleted_at = 0").
|
||||
Where("ccal.operator_name != '系统自动确定' and ccal.operator_id != ?", "0").
|
||||
Where("cast_work_analysis.submit_time <= ?", req.Date+" 23:59:59").
|
||||
Count(&data.ArtistConfirmDataAnalysisCount)
|
||||
app.ModuleClients.BundleDB.Table("cast_work_analysis").
|
||||
Joins("left join cast_cost_analysis_log ccal on ccal.analysis_uuid = cast_work_analysis.uuid AND ccal.deleted_at = 0").
|
||||
Where("cast_work_analysis.status in ?", []int{6, 7}).
|
||||
Where("cast_work_analysis.deleted_at = 0").
|
||||
Where("ccal.operator_name = '系统自动确定'").
|
||||
Where("cast_work_analysis.submit_time <= ?", req.Date+" 23:59:59").
|
||||
Count(&data.AutoConfirmDataAnalysisCount)
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
@ -1340,7 +1373,7 @@ func MetricsVideoSubmitExport(req *bundle.MetricsVideoSubmitExportReq) (result *
|
||||
Joins("left join (select created_at,work_uuid from cast_work_platform_info cwi where cwi.platform_id = 4) dm on dm.work_uuid = cw.uuid").
|
||||
Joins("left join (select created_at,work_uuid from cast_work_platform_info cwi where cwi.platform_id = 3) ins on ins.work_uuid = cw.uuid").
|
||||
Joins("left join bundle_order_records bor on bor.customer_id COLLATE utf8mb4_general_ci = cw.artist_uuid COLLATE utf8mb4_general_ci").
|
||||
Where("(tiktok.created_at is not null or dm.created_at is not null or ins.created_at is not null) and cw.deleted_at = 0 and bor.deleted_at is null").
|
||||
Where("(tiktok.created_at is not null or dm.created_at is not null or ins.created_at is not null) and cw.deleted_at = 0 and bor.deleted_at is null and cw.origin_uuid = ''").
|
||||
Order("cw.artist_name")
|
||||
} else {
|
||||
|
||||
@ -1356,7 +1389,7 @@ func MetricsVideoSubmitExport(req *bundle.MetricsVideoSubmitExportReq) (result *
|
||||
Joins(`LEFT JOIN cast_work_platform_info dm ON dm.work_uuid = cw.uuid AND dm.platform_id = 4 AND dm.created_at >= ? AND dm.created_at <= ?`, start.Unix(), end.Unix()).
|
||||
Joins(`LEFT JOIN cast_work_platform_info ins ON ins.work_uuid = cw.uuid AND ins.platform_id = 3 AND ins.created_at >= ? AND ins.created_at <= ?`, start.Unix(), end.Unix()).
|
||||
Joins(`LEFT JOIN bundle_order_records bor ON bor.customer_id COLLATE utf8mb4_general_ci = cw.artist_uuid COLLATE utf8mb4_general_ci AND bor.deleted_at IS NULL`).
|
||||
Where(`cw.deleted_at = 0 AND (tiktok.created_at IS NOT NULL OR dm.created_at IS NOT NULL OR ins.created_at IS NOT NULL)`).
|
||||
Where(`cw.origin_uuid = '' and cw.deleted_at = 0 AND (tiktok.created_at IS NOT NULL OR dm.created_at IS NOT NULL OR ins.created_at IS NOT NULL)`).
|
||||
Order("cw.artist_name")
|
||||
|
||||
}
|
||||
|
||||
@ -70,8 +70,8 @@ service Bundle {
|
||||
rpc GetImageWorkDetail(GetImageWorkDetailReq) returns (GetImageWorkDetailResp) {} // 获取图文作品详情
|
||||
rpc GetVedioWorkDetail(GetVedioWorkDetailReq) returns (GetVedioeWorkDetailResp) {} // 获取数据分析作品详情
|
||||
|
||||
rpc ToBeComfirmedWorks(ToBeComfirmedWorksReq) returns (ToBeComfirmedWorksResp) {} // 待确认作品列表
|
||||
rpc ConfirmWork(ConfirmWorkReq) returns (ConfirmWorkResp) {} // 确认作品
|
||||
rpc ToBeComfirmedWorks(ToBeComfirmedWorksReq) returns (ToBeComfirmedWorksResp) {} // 待确认作品列表（现已不用,该功能接口调整至CastWork中数据分析proto中）
|
||||
rpc ConfirmWork(ConfirmWorkReq) returns (ConfirmWorkResp) {} // 确认作品（视频、图文确认）
|
||||
|
||||
//对账单
|
||||
rpc GetReconciliationList(GetReconciliationListReq) returns (GetReconciliationListResp) {} // 获取对账单列表
|
||||
@ -1681,8 +1681,9 @@ message MetricsOperatingStatusResp {
|
||||
int64 autoConfirmDataAnalysisCount = 23;// 系统已自动确认数据数
|
||||
int64 pendingUploadDataAnalysisCount = 24;// 待发布数据数
|
||||
int64 uploadSuccessDataAnalysisCount = 25;// 发布成功数据数
|
||||
|
||||
int64 abnormalAccountAcount = 26; // 触发预警的账号数
|
||||
int64 uploadFailedDataAnalysisCount = 26;// 发布异常数据数
|
||||
|
||||
int64 abnormalAccountAcount = 27; // 触发预警的账号数
|
||||
}
|
||||
|
||||
message MetricsBundlePurchaseExportReq{
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -7,8 +7,8 @@ import (
|
||||
fmt "fmt"
|
||||
math "math"
|
||||
proto "github.com/golang/protobuf/proto"
|
||||
_ "github.com/mwitkow/go-proto-validators"
|
||||
_ "google.golang.org/protobuf/types/descriptorpb"
|
||||
_ "github.com/mwitkow/go-proto-validators"
|
||||
github_com_mwitkow_go_proto_validators "github.com/mwitkow/go-proto-validators"
|
||||
)
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user