diff --git a/internal/dao/bundleMetrics.go b/internal/dao/bundleMetrics.go index 8fe96a7..42a7d63 100644 --- a/internal/dao/bundleMetrics.go +++ b/internal/dao/bundleMetrics.go @@ -1159,7 +1159,7 @@ func MetricsOperatingStatus(req *bundle.MetricsOperatingStatusReq) (data *bundle app.ModuleClients.BundleDB.Model(model.CastWork{}). Joins("left join cast_work_log cwl on cwl.work_uuid = cast_work.uuid"). Joins("left join cast_cost_log ccl on ccl.work_uuid = cast_work.uuid"). - Where("cast_work.status = 9 and cwl.work_category = 2 and cwl.work_status = 9 and ccl.operator_name != '系统自动确定' and ccl.operator_id != ? ", "0"). + Where("cast_work.status = 9 and cwl.work_category = 2 and cwl.work_status = 9 and ccl.operator_name != '系统自动确定'"). 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.ArtistConfirmVideoCount) @@ -1184,7 +1184,7 @@ func MetricsOperatingStatus(req *bundle.MetricsOperatingStatusReq) (data *bundle app.ModuleClients.BundleDB.Model(model.CastWork{}). Joins("left join cast_work_log cwl on cwl.work_uuid = cast_work.uuid"). Joins("left join cast_cost_log ccl on ccl.work_uuid = cast_work.uuid"). - Where("cast_work.status = 9 and cwl.work_category = 1 and cwl.work_status = 9 and ccl.operator_name != '系统自动确定' and ccl.operator_id != ?", "0"). + Where("cast_work.status = 9 and cwl.work_category = 1 and cwl.work_status = 9 and ccl.operator_name != '系统自动确定'"). 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.ArtistConfirmImageCount) @@ -1197,7 +1197,7 @@ func MetricsOperatingStatus(req *bundle.MetricsOperatingStatusReq) (data *bundle 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) + app.ModuleClients.BundleDB.Table("cast_work_analysis").Where("work_analysis_status = ?", status).Where("deleted_at = 0 and submit_time <= ?", req.Date+" 23:59:59").Count(&i) return } data.ReviewingDataAnalysisCount = analysisStatistic(2) @@ -1209,14 +1209,14 @@ func MetricsOperatingStatus(req *bundle.MetricsOperatingStatusReq) (data *bundle 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.work_analysis_status in ?", []int{6, 7}). Where("cast_work_analysis.deleted_at = 0"). - Where("ccal.operator_name != '系统自动确定' and ccal.operator_id != ?", "0"). + Where("ccal.operator_name != '系统自动确定'"). 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.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").