Merge branch 'dev-lzh-1029' into dev

internal/dao/bundleMetrics.go

@@ -608,12 +608,12 @@ 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").
-		Where("cwl.work_category = 2 and cwl.work_status = 9 and cast_work.deleted_at = 0  and operator_id != ?", "0").
+		Where("cast_work.status  = 9 and cwl.work_category = 2 and cwl.work_status = 9 and cast_work.deleted_at = 0  and operator_id != ?", "0").
 		Where("cast_work.created_at <= ?", timeParse(req.Date+" 23:59:59").Unix()).
 		Count(&data.ArtistConfirmVideoCount)
 	app.ModuleClients.BundleDB.Model(model.CastWork{}).
 		Joins("left join cast_work_log cwl on cwl.work_uuid = cast_work.uuid").
-		Where("cwl.work_category = 2 and cwl.work_status = 9 and cast_work.deleted_at = 0  and operator_id = ?", "0").
+		Where("cast_work.status  = 9 and cwl.work_category = 2 and cwl.work_status = 9 and cast_work.deleted_at = 0  and operator_id = ?", "0").
 		Where("cast_work.created_at <= ?", timeParse(req.Date+" 23:59:59").Unix()).
 		Count(&data.AutoConfirmVideoCount)
 
@@ -628,12 +628,12 @@ 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").
-		Where("cwl.work_category = 1 and cwl.work_status = 9 and cast_work.deleted_at = 0  and operator_id != ?", "0").
+		Where("cast_work.status  = 9 and cwl.work_category = 1 and cwl.work_status = 9 and cast_work.deleted_at = 0  and operator_id != ?", "0").
 		Where("cast_work.created_at <= ?", timeParse(req.Date+" 23:59:59").Unix()).
 		Count(&data.ArtistConfirmImageCount)
 	app.ModuleClients.BundleDB.Model(model.CastWork{}).
 		Joins("left join cast_work_log cwl on cwl.work_uuid = cast_work.uuid").
-		Where("cwl.work_category = 1 and cwl.work_status = 9 and cast_work.deleted_at = 0  and operator_id = ?", "0").
+		Where("cast_work.status  = 9 and cwl.work_category = 1 and cwl.work_status = 9 and cast_work.deleted_at = 0  and operator_id = ?", "0").
 		Where("cast_work.created_at <= ?", timeParse(req.Date+" 23:59:59").Unix()).
 		Count(&data.AutoConfirmImageCount)
 	//======================数据分析暂时未做======================