From e4fa5eb9de2379d77be3910bfc7d462983199b3a Mon Sep 17 00:00:00 2001 From: "jiaji.H" Date: Thu, 26 Feb 2026 16:17:16 +0800 Subject: [PATCH] =?UTF-8?q?Updata=EF=BC=9A=E4=BC=98=E5=8C=96=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/dao/bundleMetrics.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/dao/bundleMetrics.go b/internal/dao/bundleMetrics.go index 50c3bf3..e6c13e1 100644 --- a/internal/dao/bundleMetrics.go +++ b/internal/dao/bundleMetrics.go @@ -335,7 +335,7 @@ func MetricsBusiness(req *bundle.MetricsBusinessReq) (result *bundle.MetricsBusi } else { 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 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.submit_time >= ?", req.Start+" 00:00:00"). Where("cast_work.submit_time <= ?", req.End+" 23:59:59"). @@ -474,7 +474,7 @@ func MetricsBusiness(req *bundle.MetricsBusinessReq) (result *bundle.MetricsBusi } else { 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 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.submit_time >= ?", req.Start+" 00:00:00"). Where("cast_work.submit_time <= ?", req.End+" 23:59:59"). @@ -552,7 +552,7 @@ func MetricsBusiness(req *bundle.MetricsBusinessReq) (result *bundle.MetricsBusi } else { 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 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.End+" 23:59:59"). 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 { 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 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.End+" 23:59:59"). Where("ccr.deleted_at = 0 and bor.deleted_at IS NULL and ccrpe.deleted_at = 0").