change one item in service for mission
This commit is contained in:
@@ -39,13 +39,13 @@ class ReportService
|
|||||||
|
|
||||||
COUNT(DISTINCT CASE
|
COUNT(DISTINCT CASE
|
||||||
WHEN mv.type = 1
|
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
|
THEN mv.id
|
||||||
END) AS no_mission_count,
|
END) AS no_mission_count,
|
||||||
|
|
||||||
COUNT(DISTINCT CASE
|
COUNT(DISTINCT CASE
|
||||||
WHEN m.mission_duration != m.in_area_duration
|
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
|
THEN m.id
|
||||||
END) AS out_of_area_count
|
END) AS out_of_area_count
|
||||||
|
|
||||||
@@ -61,6 +61,7 @@ class ReportService
|
|||||||
)
|
)
|
||||||
|
|
||||||
SELECT
|
SELECT
|
||||||
|
-1 AS province_id,
|
||||||
'کل کشور' AS province_name,
|
'کل کشور' AS province_name,
|
||||||
SUM(no_mission_count) AS no_mission_count,
|
SUM(no_mission_count) AS no_mission_count,
|
||||||
SUM(out_of_area_count) AS out_of_area_count
|
SUM(out_of_area_count) AS out_of_area_count
|
||||||
@@ -78,8 +79,10 @@ class ReportService
|
|||||||
";
|
";
|
||||||
|
|
||||||
return DB::select($sql, [
|
return DB::select($sql, [
|
||||||
'from' => $from,
|
'from_mv' => $from,
|
||||||
'to' => $to,
|
'to_mv' => $to,
|
||||||
|
'from_m' => $from,
|
||||||
|
'to_m' => $to,
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user