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

Merge pull request 'feature/MissionExport' (#1) from feature/MissionExport into develop

Browse Source 
Reviewed-on: http://192.168.1.20:3000/RMS/Backend/pulls/1
This commit is contained in:
faezeh
2026-01-24 10:17:23 +00:00
parent 9c469a3a19 f93f361d8f
commit 44e7f6a321
8 changed files with 90 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env.example
View File

@@ -100,7 +100,7 @@ HARIM_NEED_GUARANTEE_LETTER_USERNAME=
BACKUP_TARGET_DIR= BACKUP_TARGET_DIR=
BACKUP_USER= BACKUP_USER=
BACKUP_PASSWORD= BACKUP_PASSWORD=1qaz
HARIM_ENCRYPTION_KEY="TestKey" HARIM_ENCRYPTION_KEY="TestKey"

15
app/Exports/V3/Mission/Report/CountryReport.php
View File

@@ -10,9 +10,11 @@ use Maatwebsite\Excel\Concerns\WithEvents;
use Maatwebsite\Excel\Events\AfterSheet; use Maatwebsite\Excel\Events\AfterSheet;
use PhpOffice\PhpSpreadsheet\Worksheet\Drawing; use PhpOffice\PhpSpreadsheet\Worksheet\Drawing;
class CountryReport implements FromView, WithEvents, ShouldAutoSize, WithDrawings class CountryReport implements FromView, ShouldAutoSize, WithDrawings, WithEvents
{ {
public function __construct(private array $data){} public function __construct(private array $data)
{
}
public function view(): View public function view(): View
{ {
@@ -29,11 +31,11 @@ class CountryReport implements FromView, WithEvents, ShouldAutoSize, WithDrawing
'no_mission_count' => (int) ($r->no_mission_count ?? 0), 'no_mission_count' => (int) ($r->no_mission_count ?? 0),
'out_of_area_count' => (int) ($r->out_of_area_count ?? 0), 'out_of_area_count' => (int) ($r->out_of_area_count ?? 0),
]; ];
continue; continue;
} }
if (! isset($grid[$pid])) {
if (!isset($grid[$pid])) {
$grid[$pid] = [ $grid[$pid] = [
'province_name' => $name, 'province_name' => $name,
]; ];
@@ -45,7 +47,9 @@ class CountryReport implements FromView, WithEvents, ShouldAutoSize, WithDrawing
} }
$exportRows = []; $exportRows = [];
if ($national) $exportRows[] = $national; if ($national) {
$exportRows[] = $national;
}
foreach ($grid as $row) { foreach ($grid as $row) {
$exportRows[] = $row; $exportRows[] = $row;
} }
@@ -85,6 +89,7 @@ class CountryReport implements FromView, WithEvents, ShouldAutoSize, WithDrawing
$drawing2->setOffsetX(5); $drawing2->setOffsetX(5);
$drawing2->setOffsetY(5); $drawing2->setOffsetY(5);
$drawing2->setCoordinates('C1'); $drawing2->setCoordinates('C1');
return [$drawing, $drawing2]; return [$drawing, $drawing2];
} }
} }

17
app/Exports/V3/Mission/Report/ProvinceReport.php
View File

@@ -2,7 +2,6 @@
namespace App\Exports\V3\Mission\Report; namespace App\Exports\V3\Mission\Report;
use Illuminate\Contracts\View\View; use Illuminate\Contracts\View\View;
use Maatwebsite\Excel\Concerns\FromView; use Maatwebsite\Excel\Concerns\FromView;
use Maatwebsite\Excel\Concerns\ShouldAutoSize; use Maatwebsite\Excel\Concerns\ShouldAutoSize;
@@ -12,9 +11,11 @@ use Maatwebsite\Excel\Events\AfterSheet;
use PhpOffice\PhpSpreadsheet\Exception; use PhpOffice\PhpSpreadsheet\Exception;
use PhpOffice\PhpSpreadsheet\Worksheet\Drawing; use PhpOffice\PhpSpreadsheet\Worksheet\Drawing;
class ProvinceReport implements FromView, WithEvents, ShouldAutoSize, WithDrawings class ProvinceReport implements FromView, ShouldAutoSize, WithDrawings, WithEvents
{ {
public function __construct(private array $data){} public function __construct(private array $data)
{
}
public function view(): View public function view(): View
{ {
@@ -31,11 +32,11 @@ class ProvinceReport implements FromView, WithEvents, ShouldAutoSize, WithDrawin
'no_mission_count' => (int) ($r->no_mission_count ?? 0), 'no_mission_count' => (int) ($r->no_mission_count ?? 0),
'out_of_area_count' => (int) ($r->out_of_area_count ?? 0), 'out_of_area_count' => (int) ($r->out_of_area_count ?? 0),
]; ];
continue; continue;
} }
if (! isset($grid[$cid])) {
if (!isset($grid[$cid])) {
$grid[$cid] = [ $grid[$cid] = [
'city_name' => $name, 'city_name' => $name,
]; ];
@@ -47,12 +48,13 @@ class ProvinceReport implements FromView, WithEvents, ShouldAutoSize, WithDrawin
} }
$exportRows = []; $exportRows = [];
if ($province) $exportRows[] = $province; if ($province) {
$exportRows[] = $province;
}
foreach ($grid as $row) { foreach ($grid as $row) {
$exportRows[] = $row; $exportRows[] = $row;
} }
return view('v3.Reports.Mission.Report.ProvinceActivityReport', [ return view('v3.Reports.Mission.Report.ProvinceActivityReport', [
'rows' => $exportRows, 'rows' => $exportRows,
]); ]);
@@ -91,6 +93,7 @@ class ProvinceReport implements FromView, WithEvents, ShouldAutoSize, WithDrawin
$drawing2->setOffsetX(5); $drawing2->setOffsetX(5);
$drawing2->setOffsetY(5); $drawing2->setOffsetY(5);
$drawing2->setCoordinates('C1'); $drawing2->setCoordinates('C1');
return [$drawing, $drawing2]; return [$drawing, $drawing2];
} }
} }

11
app/Services/Cartables/Mission/ControlUnitService.php
View File

@@ -2,7 +2,6 @@
namespace App\Services\Cartables\Mission; namespace App\Services\Cartables\Mission;
use App\Enums\MissionStates; use App\Enums\MissionStates;
use App\Facades\DataTable\DataTableFacade; use App\Facades\DataTable\DataTableFacade;
use App\Http\Traits\ApiResponse; use App\Http\Traits\ApiResponse;
@@ -19,16 +18,14 @@ class ControlUnitService
$user = Auth::user(); $user = Auth::user();
$query = Mission::query()->whereIn('state_id', [ $query = Mission::query()->whereIn('state_id', [
MissionStates::PENDING_CONFIRMATION->value, MissionStates::START_MISSION->value MissionStates::PENDING_CONFIRMATION->value, MissionStates::START_MISSION->value,
]); ]);
if ($user->hasPermissionTo('manage-control-unit-station')) { if ($user->hasPermissionTo('manage-control-unit-station')) {
$query->where('station_id', '=', $user->station_id); $query->where('station_id', '=', $user->station_id);
} } elseif ($user->hasPermissionTo('manage-control-unit-city')) {
elseif ($user->hasPermissionTo('manage-control-unit-city')) {
$query->where('city_id', '=', $user->city_id); $query->where('city_id', '=', $user->city_id);
} } elseif ($user->hasPermissionTo('manage-control-unit-province')) {
elseif ($user->hasPermissionTo('manage-control-unit-province')) {
$query->where('province_id', '=', $user->province_id); $query->where('province_id', '=', $user->province_id);
} }
@@ -41,7 +38,7 @@ class ControlUnitService
'id', 'user_id', 'username', 'state_name', 'province_name', 'edare_shahri_name', 'id', 'user_id', 'username', 'state_name', 'province_name', 'edare_shahri_name',
'description', 'requested_machines', 'type', 'type_fa', 'start_date', 'state_id', 'description', 'requested_machines', 'type', 'type_fa', 'start_date', 'state_id',
'end_date', 'request_date', 'end_point', 'area', 'zone', 'zone_fa', 'start_time', 'finish_time', 'end_date', 'request_date', 'end_point', 'area', 'zone', 'zone_fa', 'start_time', 'finish_time',
'code', 'category_id', 'category_name', 'explanation', 'city_id', 'city_name', 'province_id', 'station_name' 'code', 'category_id', 'category_name', 'explanation', 'city_id', 'city_name', 'province_id', 'station_name',
] ]
); );
} }

6
app/Services/Cartables/Mission/DailyMoveMachineService.php
View File

@@ -17,11 +17,9 @@ class DailyMoveMachineService
if ($user->hasPermissionTo('manage-violation-station')) { if ($user->hasPermissionTo('manage-violation-station')) {
$query->whereRelation('machine', 'station_id', '=', $user->station_id); $query->whereRelation('machine', 'station_id', '=', $user->station_id);
} } elseif ($user->hasPermissionTo('manage-violation-city')) {
elseif ($user->hasPermissionTo('manage-violation-city')) {
$query->whereRelation('machine', 'city_id', '=', $user->city_id); $query->whereRelation('machine', 'city_id', '=', $user->city_id);
} } elseif ($user->hasPermissionTo('manage-violation-province')) {
elseif ($user->hasPermissionTo('manage-violation-province')) {
$query->whereRelation('machine', 'province_id', '=', $user->province_id); $query->whereRelation('machine', 'province_id', '=', $user->province_id);
} }

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

@@ -3,7 +3,6 @@
namespace App\Services\Cartables\Mission; namespace App\Services\Cartables\Mission;
use App\Facades\DataTable\DataTableFacade; use App\Facades\DataTable\DataTableFacade;
use App\Models\Mission;
use App\Models\MissionViolation; use App\Models\MissionViolation;
use Carbon\Carbon; use Carbon\Carbon;
use Illuminate\Http\Request; use Illuminate\Http\Request;
@@ -15,7 +14,7 @@ class ReportService
{ {
$user = auth()->user(); $user = auth()->user();
$query =MissionViolation::query()->where('edare_shahri_id', '=', $user->edarate_shahri_id); $query = MissionViolation::query()->where('edare_shahri_id', '=', $user->edarate_shahri_id);
return DataTableFacade::run( return DataTableFacade::run(
$query, $query,
@@ -28,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 = Carbon::parse($request->to_date)->endOfDay()?? today()->endOfDay(); $to = Carbon::parse($request->to_date)->endOfDay() ?? today()->endOfDay();
$sql = " $sql = "
WITH r AS ( WITH r AS (
@@ -36,25 +35,25 @@ class ReportService
p.id AS province_id, p.id AS province_id,
p.name_fa AS province_name, p.name_fa AS province_name,
COUNT(DISTINCT CASE COUNT(DISTINCT mv.id) AS no_mission_count,
WHEN mv.type = 1 COUNT(DISTINCT m.id) AS out_of_area_count
AND mv.created_at >= :from_mv AND mv.created_at <= :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 >= :from_m AND m.created_at <= :to_m
THEN m.id
END) AS out_of_area_count
FROM provinces p FROM provinces p
LEFT JOIN cmms_machines cm LEFT JOIN cmms_machines cm
ON cm.province_id = p.id ON cm.province_id = p.id
LEFT JOIN mission_violations mv LEFT JOIN mission_violations mv
ON TRIM(cm.machine_code) = TRIM(mv.machine_code) ON TRIM(cm.machine_code) = TRIM(mv.machine_code)
AND mv.type = 1
AND mv.created_at >= :from_mv
AND mv.created_at <= :to_mv
LEFT JOIN missions m LEFT JOIN missions m
ON m.province_id = p.id ON m.province_id = p.id
AND m.mission_duration != m.in_area_duration
AND m.created_at >= :from_m
AND m.created_at <= :to_m
GROUP BY p.id, p.name_fa GROUP BY p.id, p.name_fa
) )
@@ -73,7 +72,7 @@ class ReportService
FROM r FROM r
ORDER BY ORDER BY
CASE WHEN province_name = 'کل کشور' THEN 0 ELSE 1 END, CASE WHEN province_id = -1 THEN 0 ELSE 1 END,
province_name province_name
"; ";
@@ -84,6 +83,7 @@ class ReportService
'to_m' => $to, 'to_m' => $to,
]); ]);
} }
public function provinceActivity(Request $request): array public function provinceActivity(Request $request): array
{ {
$provinceId = $request->province_id ?? auth()->user()->province_id; $provinceId = $request->province_id ?? auth()->user()->province_id;
@@ -96,31 +96,30 @@ class ReportService
c.id AS city_id, c.id AS city_id,
c.name_fa AS city_name, c.name_fa AS city_name,
COUNT(DISTINCT CASE COUNT(DISTINCT mv.id) AS no_mission_count,
WHEN mv.type = 1 COUNT(DISTINCT m.id) AS out_of_area_count
AND mv.created_at >= :from_mv AND mv.created_at <= :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 >= :from_m AND m.created_at <= :to_m
THEN m.id
END) AS out_of_area_count
FROM cities c FROM cities c
LEFT JOIN cmms_machines cm LEFT JOIN cmms_machines cm
ON cm.city_id = c.id ON cm.city_id = c.id
LEFT JOIN mission_violations mv LEFT JOIN mission_violations mv
ON TRIM(cm.machine_code) = TRIM(mv.machine_code) ON TRIM(cm.machine_code) = TRIM(mv.machine_code)
AND mv.type = 1
AND mv.created_at >= :from_mv
AND mv.created_at <= :to_mv
LEFT JOIN missions m LEFT JOIN missions m
ON m.city_id = c.id ON m.city_id = c.id
AND m.mission_duration != m.in_area_duration
AND m.created_at >= :from_m
AND m.created_at <= :to_m
WHERE c.province_id = :province_id WHERE c.province_id = :province_id
AND (
c.type_id = 1
OR c.name_fa IN ('اداره ماشين‌آلات', 'اداره نقلیه')
)
GROUP BY c.id, c.name_fa GROUP BY c.id, c.name_fa
) )

9
app/Services/Cartables/Mission/RequestPortalService.php
View File

@@ -2,7 +2,6 @@
namespace App\Services\Cartables\Mission; namespace App\Services\Cartables\Mission;
use App\Facades\DataTable\DataTableFacade; use App\Facades\DataTable\DataTableFacade;
use App\Http\Traits\ApiResponse; use App\Http\Traits\ApiResponse;
use App\Models\Mission; use App\Models\Mission;
@@ -19,11 +18,9 @@ class RequestPortalService
if ($user->hasPermissionTo('manage-request-portal-station')) { if ($user->hasPermissionTo('manage-request-portal-station')) {
$query->where('station_id', '=', $user->station_id); $query->where('station_id', '=', $user->station_id);
} } elseif ($user->hasPermissionTo('manage-request-portal-city')) {
elseif ($user->hasPermissionTo('manage-request-portal-city')) {
$query->where('city_id', '=', $user->city_id); $query->where('city_id', '=', $user->city_id);
} } elseif ($user->hasPermissionTo('manage-request-portal-province')) {
elseif ($user->hasPermissionTo('manage-request-portal-province')) {
$query->where('province_id', '=', $user->province_id); $query->where('province_id', '=', $user->province_id);
} }
@@ -36,7 +33,7 @@ class RequestPortalService
'id', 'user_id', 'username', 'state_name', 'province_name', 'edare_shahri_name', 'id', 'user_id', 'username', 'state_name', 'province_name', 'edare_shahri_name',
'description', 'requested_machines', 'type', 'type_fa', 'start_date', 'state_id', 'description', 'requested_machines', 'type', 'type_fa', 'start_date', 'state_id',
'end_date', 'request_date', 'end_point', 'area', 'zone', 'zone_fa', 'start_time', 'finish_time', 'end_date', 'request_date', 'end_point', 'area', 'zone', 'zone_fa', 'start_time', 'finish_time',
'code', 'category_id', 'category_name', 'explanation', 'city_id', 'city_name', 'province_id', 'station_name' 'code', 'category_id', 'category_name', 'explanation', 'city_id', 'city_name', 'province_id', 'station_name',
] ]
); );
} }

8
app/Services/Cartables/Mission/TransportationUnitService.php
View File

@@ -18,11 +18,9 @@ class TransportationUnitService
if ($user->hasPermissionTo('manage-transportation-unit-station')) { if ($user->hasPermissionTo('manage-transportation-unit-station')) {
$query->where('station_id', '=', $user->station_id); $query->where('station_id', '=', $user->station_id);
} } elseif ($user->hasPermissionTo('manage-transportation-unit-city')) {
elseif ($user->hasPermissionTo('manage-transportation-unit-city')) {
$query->where('city_id', '=', $user->city_id); $query->where('city_id', '=', $user->city_id);
} } elseif ($user->hasPermissionTo('manage-transportation-unit-province')) {
elseif ($user->hasPermissionTo('manage-transportation-unit-province')) {
$query->where('province_id', '=', $user->province_id); $query->where('province_id', '=', $user->province_id);
} }
@@ -35,7 +33,7 @@ class TransportationUnitService
'id', 'user_id', 'username', 'state_name', 'province_name', 'edare_shahri_name', 'id', 'user_id', 'username', 'state_name', 'province_name', 'edare_shahri_name',
'description', 'requested_machines', 'type', 'type_fa', 'start_date', 'state_id', 'description', 'requested_machines', 'type', 'type_fa', 'start_date', 'state_id',
'end_date', 'request_date', 'end_point', 'area', 'zone', 'zone_fa', 'start_time', 'finish_time', 'end_date', 'request_date', 'end_point', 'area', 'zone', 'zone_fa', 'start_time', 'finish_time',
'code', 'category_id', 'category_name', 'explanation', 'km', 'city_id', 'city_name', 'province_id', 'station_name' 'code', 'category_id', 'category_name', 'explanation', 'km', 'city_id', 'city_name', 'province_id', 'station_name',
] ]
); );
} }