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

resolve the conflicts

Browse Source
This commit is contained in:
amirghasempoor
2026-06-13 14:23:03 +03:30
parent a8c71de069 1e106a0c87
commit 5f2d214a56
8 changed files with 88 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Services/Cartables/Mission/Report/ReportMachineService.php
View File

@@ -20,7 +20,7 @@ class ReportMachineService
m.machine_code,
cm.car_name,
COUNT(*) AS missions,
SUM(m.end_km - m.km) AS func,
SUM(m.end_km - m.km) AS func
FROM missions m
JOIN cmms_machines cm ON cm.id = m.machine_id
WHERE m.state_id = 4 AND m.start_time >= :from AND m.finish_time <= :to
@@ -59,7 +59,7 @@ class ReportMachineService
$sql = "SELECT
cm.car_type,
COUNT(*) AS missions,
SUM(m.end_km - m.km) AS func,
SUM(m.end_km - m.km) AS func
FROM missions m
JOIN cmms_machines cm ON cm.id = m.machine_id
WHERE m.state_id = 4 AND m.start_time >= :from AND m.finish_time <= :to
@@ -80,7 +80,7 @@ class ReportMachineService
$sql = "SELECT
cm.car_type,
COUNT(*) AS missions,
SUM(m.end_km - m.km) AS func,
SUM(m.end_km - m.km) AS func
FROM missions m
JOIN cmms_machines cm ON cm.id = m.machine_id
WHERE m.state_id = 4 AND m.start_time >= :from AND m.finish_time <= :to AND province_id = :province_id
@@ -102,7 +102,7 @@ class ReportMachineService
m.driver_id,
m.driver_name,
COUNT(*) AS missions,
SUM(m.end_km - m.km) AS func,
SUM(m.end_km - m.km) AS func
FROM missions m
WHERE m.state_id = 4 AND m.start_time >= :from AND m.finish_time <= :to
GROUP BY m.driver_id;";
@@ -123,7 +123,7 @@ class ReportMachineService
m.driver_id,
m.driver_name,
COUNT(*) AS missions,
SUM(m.end_km - m.km) AS func,
SUM(m.end_km - m.km) AS func
FROM missions m
WHERE m.state_id = 4 AND m.start_time >= :from AND m.finish_time <= :to AND province_id = :province_id
GROUP BY m.driver_id;";