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

Merge branch 'feat-hjj-MetricsManager#260226' into dev

Browse Source
This commit is contained in:
jiaji.H 2026-02-26 16:17:31 +08:00
commit 4c81f80d5f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
internal/dao/bundleMetrics.go
View File

@ -335,7 +335,7 @@ func MetricsBusiness(req *bundle.MetricsBusinessReq) (result *bundle.MetricsBusi
} else { } else {
query = app.ModuleClients.BundleDB.Model(&model.CastWork{}). query = app.ModuleClients.BundleDB.Model(&model.CastWork{}).
Joins("LEFT JOIN cast_work_extra cwe ON cwe.work_uuid COLLATE utf8mb4_general_ci = cast_work.uuid COLLATE utf8mb4_general_ci"). Joins("LEFT JOIN cast_work_extra cwe ON cwe.work_uuid COLLATE utf8mb4_general_ci = cast_work.uuid COLLATE utf8mb4_general_ci").
Joins("left join bundle_order_records bor ON bor.uuid COLLATE utf8mb4_general_ci = cwe.bundle_order_uuid COLLATE utf8mb4_general_ci"). Joins("left join bundle_order_records bor ON bor.uuid = cwe.bundle_order_uuid ").
Where("cast_work.work_category = 2"). Where("cast_work.work_category = 2").
Where("cast_work.submit_time >= ?", req.Start+" 00:00:00"). Where("cast_work.submit_time >= ?", req.Start+" 00:00:00").
Where("cast_work.submit_time <= ?", req.End+" 23:59:59"). Where("cast_work.submit_time <= ?", req.End+" 23:59:59").
@ -474,7 +474,7 @@ func MetricsBusiness(req *bundle.MetricsBusinessReq) (result *bundle.MetricsBusi
} else { } else {
query = app.ModuleClients.BundleDB.Model(&model.CastWork{}). query = app.ModuleClients.BundleDB.Model(&model.CastWork{}).
Joins("LEFT JOIN cast_work_extra cwe ON cwe.work_uuid COLLATE utf8mb4_general_ci = cast_work.uuid COLLATE utf8mb4_general_ci"). Joins("LEFT JOIN cast_work_extra cwe ON cwe.work_uuid COLLATE utf8mb4_general_ci = cast_work.uuid COLLATE utf8mb4_general_ci").
Joins("left join bundle_order_records bor ON bor.uuid COLLATE utf8mb4_general_ci = cwe.bundle_order_uuid COLLATE utf8mb4_general_ci"). Joins("left join bundle_order_records bor ON bor.uuid = cwe.bundle_order_uuid ").
Where("cast_work.work_category = 1"). Where("cast_work.work_category = 1").
Where("cast_work.submit_time >= ?", req.Start+" 00:00:00"). Where("cast_work.submit_time >= ?", req.Start+" 00:00:00").
Where("cast_work.submit_time <= ?", req.End+" 23:59:59"). Where("cast_work.submit_time <= ?", req.End+" 23:59:59").
@ -552,7 +552,7 @@ func MetricsBusiness(req *bundle.MetricsBusinessReq) (result *bundle.MetricsBusi
} else { } else {
query = app.ModuleClients.BundleDB.Table("cast_work_analysis as cwa"). query = app.ModuleClients.BundleDB.Table("cast_work_analysis as cwa").
Joins("LEFT JOIN cast_work_analysis_extra cwae ON cwae.analysis_uuid COLLATE utf8mb4_general_ci = cwa.uuid COLLATE utf8mb4_general_ci"). Joins("LEFT JOIN cast_work_analysis_extra cwae ON cwae.analysis_uuid COLLATE utf8mb4_general_ci = cwa.uuid COLLATE utf8mb4_general_ci").
Joins("left join bundle_order_records bor ON bor.uuid COLLATE utf8mb4_general_ci = cwae.bundle_order_uuid COLLATE utf8mb4_general_ci"). Joins("left join bundle_order_records bor ON bor.uuid = cwae.bundle_order_uuid ").
Where("cwa.submit_time >= ?", req.Start+" 00:00:00"). Where("cwa.submit_time >= ?", req.Start+" 00:00:00").
Where("cwa.submit_time <= ?", req.End+" 23:59:59"). Where("cwa.submit_time <= ?", req.End+" 23:59:59").
Where("cwa.deleted_at = 0 and bor.deleted_at IS NULL and cwae.deleted_at = 0"). Where("cwa.deleted_at = 0 and bor.deleted_at IS NULL and cwae.deleted_at = 0").
@ -622,7 +622,7 @@ func MetricsBusiness(req *bundle.MetricsBusinessReq) (result *bundle.MetricsBusi
} else { } else {
query = app.ModuleClients.BundleDB.Table("cast_competitive_report as ccr"). query = app.ModuleClients.BundleDB.Table("cast_competitive_report as ccr").
Joins("LEFT JOIN cast_competitive_report_extra ccrpe ON ccrpe.report_uuid COLLATE utf8mb4_general_ci = ccr.uuid COLLATE utf8mb4_general_ci"). Joins("LEFT JOIN cast_competitive_report_extra ccrpe ON ccrpe.report_uuid COLLATE utf8mb4_general_ci = ccr.uuid COLLATE utf8mb4_general_ci").
Joins("left join bundle_order_records bor ON bor.uuid COLLATE utf8mb4_general_ci = ccrpe.bundle_order_uuid COLLATE utf8mb4_general_ci"). Joins("left join bundle_order_records bor ON bor.uuid = ccrpe.bundle_order_uuid ").
Where("ccr.submit_time >= ?", req.Start+" 00:00:00"). Where("ccr.submit_time >= ?", req.Start+" 00:00:00").
Where("ccr.submit_time <= ?", req.End+" 23:59:59"). Where("ccr.submit_time <= ?", req.End+" 23:59:59").
Where("ccr.deleted_at = 0 and bor.deleted_at IS NULL and ccrpe.deleted_at = 0"). Where("ccr.deleted_at = 0 and bor.deleted_at IS NULL and ccrpe.deleted_at = 0").