RMS/backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve service cartabl

Browse Source
This commit is contained in:
faezehzafarbakhsh
2025-12-29 15:26:47 +03:30
parent 971d6fd3dd
commit dbeaf431a3
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/Services/Cartables/Mission/ReportService.php
View File

@@ -2,9 +2,9 @@
namespace App\Services\Cartables\Mission; namespace App\Services\Cartables\Mission;
use App\Exceptions\ProhibitedAction;
use App\Facades\DataTable\DataTableFacade; use App\Facades\DataTable\DataTableFacade;
use App\Models\Mission; use App\Models\Mission;
use Carbon\Carbon;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\DB;
@@ -27,7 +27,7 @@ class ReportService
public function countryActivity(Request $request): array public function countryActivity(Request $request): array
{ {
$from = $request->from_date ?? today()->startOfDay(); $from = $request->from_date ?? today()->startOfDay();
$to = $request->to_date ?? today()->endOfDay(); $to = Carbon::parse($request->to_date)->endOfDay()?? today()->endOfDay();
$sql = " $sql = "
WITH r AS ( WITH r AS (
@@ -37,13 +37,13 @@ class ReportService
COUNT(DISTINCT CASE COUNT(DISTINCT CASE
WHEN mv.type = 1 WHEN mv.type = 1
AND mv.created_at BETWEEN :from_mv AND :to_mv AND mv.created_at >= :from_mv AND mv.created_at <= :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_m AND :to_m AND m.created_at >= :from_m AND m.created_at <= :to_m
THEN m.id THEN m.id
END) AS out_of_area_count END) AS out_of_area_count
@@ -87,7 +87,7 @@ class ReportService
{ {
$provinceId = $request->province_id ?? auth()->user()->province_id; $provinceId = $request->province_id ?? auth()->user()->province_id;
$from = $request->from_date ?? today()->startOfDay(); $from = $request->from_date ?? today()->startOfDay();
$to = $request->to_date ?? today()->endOfDay(); $to = Carbon::parse($request->to_date)->endOfDay() ?? today()->endOfDay();
$sql = " $sql = "
WITH r AS ( WITH r AS (
@@ -97,13 +97,13 @@ class ReportService
COUNT(DISTINCT CASE COUNT(DISTINCT CASE
WHEN mv.type = 1 WHEN mv.type = 1
AND mv.created_at BETWEEN :from_mv AND :to_mv AND mv.created_at >= :from_mv AND mv.created_at <= :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_m AND :to_m AND m.created_at >= :from_m AND m.created_at <= :to_m
THEN m.id THEN m.id
END) AS out_of_area_count END) AS out_of_area_count