fiee/micro-bundle
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feat-hjj-Competitors#A203' into dev

Browse Source
This commit is contained in:
jiaji.H 2026-01-15 13:11:24 +08:00
commit 0ff38110f4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/dao/bundleMetrics.go
View File

@ -1373,7 +1373,7 @@ func MetricsOperatingStatus(req *bundle.MetricsOperatingStatusReq) (data *bundle
Count(&data.AutoConfirmDataAnalysisCount)
//================竞品数==================
var competitiveStatistic = func(status int8) (i int64) {
app.ModuleClients.BundleDB.Table("cast_competitive_report as ccr").Where("ccr.work_analysis_status = ?", status).Where("deleted_at = 0 and submit_time <= ?", req.Date+" 23:59:59").Count(&i)
app.ModuleClients.BundleDB.Table("cast_competitive_report as ccr").Where("ccr.work_report_status = ?", status).Where("deleted_at = 0 and submit_time <= ?", req.Date+" 23:59:59").Count(&i)
return
}
data.ReviewingCompetitiveCount = competitiveStatistic(2)
@ -1386,14 +1386,14 @@ func MetricsOperatingStatus(req *bundle.MetricsOperatingStatusReq) (data *bundle
Joins("left join cast_cost_competitive_report_log cccrl on cccrl.report_uuid = ccr.uuid AND cccrl.deleted_at = 0").
Where("ccr.work_report_status in ?", []int{6, 7}).
Where("ccr.submit_time <= ?", req.Date+" 23:59:59").
Where("cccl.operator_name != '系统自动确定'").
Where("cccrl.operator_name != '系统自动确定'").
Where("ccr.deleted_at = 0").
Count(&data.ArtistConfirmCompetitiveCount)
app.ModuleClients.BundleDB.Table("cast_competitive_report as ccr").
Joins("left join cast_cost_competitive_report_log cccrl on cccrl.report_uuid = ccr.uuid AND cccrl.deleted_at = 0").
Where("ccr.work_report_status in ?", []int{6, 7}).
Where("ccr.submit_time <= ?", req.Date+" 23:59:59").
Where("cccl.operator_name = '系统自动确定'").
Where("cccrl.operator_name = '系统自动确定'").
Where("ccr.deleted_at = 0").
Count(&data.AutoConfirmCompetitiveCount)
return