From 780c42054721707892fb4e233e4832493aafa67f Mon Sep 17 00:00:00 2001 From: faezehzafarbakhsh Date: Wed, 24 Dec 2025 09:46:36 +0330 Subject: [PATCH] change one item in service for mission --- app/Services/Cartables/Mission/ReportService.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/app/Services/Cartables/Mission/ReportService.php b/app/Services/Cartables/Mission/ReportService.php index 1a50d4a6..d0ce7757 100644 --- a/app/Services/Cartables/Mission/ReportService.php +++ b/app/Services/Cartables/Mission/ReportService.php @@ -39,13 +39,13 @@ class ReportService COUNT(DISTINCT CASE WHEN mv.type = 1 - AND mv.created_at BETWEEN :from AND :to + AND mv.created_at BETWEEN :from_mv AND :to_mv THEN mv.id END) AS no_mission_count, COUNT(DISTINCT CASE WHEN m.mission_duration != m.in_area_duration - AND m.created_at BETWEEN :from AND :to + AND m.created_at BETWEEN :from_m AND :to_m THEN m.id END) AS out_of_area_count @@ -61,6 +61,7 @@ class ReportService ) SELECT + -1 AS province_id, 'کل کشور' AS province_name, SUM(no_mission_count) AS no_mission_count, SUM(out_of_area_count) AS out_of_area_count @@ -78,8 +79,10 @@ class ReportService "; return DB::select($sql, [ - 'from' => $from, - 'to' => $to, + 'from_mv' => $from, + 'to_mv' => $to, + 'from_m' => $from, + 'to_m' => $to, ]); }