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

debug the reports

Browse Source
This commit is contained in:
amirghasempoor
2026-01-26 16:40:34 +03:30
parent 5b678cd938
commit acdce4a3bd
7 changed files with 259 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/V3/Dashboard/Mission/Report/ReportTradodController.php
View File

@@ -31,7 +31,13 @@ class ReportTradodController extends Controller
{
return $this->successResponse([
'activities' =>$reportMissionService->provinceActivity($request),
'city' => City::query()->where('province_id', $request->province_id)->get(['id', 'name_fa']),
'city' => City::query()
->where('province_id', $request->province_id)
->where(function ($query) {
$query->where('type_id', 1)
->orWhereIn('name_fa', ['اداره ماشين‌آلات', 'اداره نقلیه']);
})
->get(['id', 'name_fa'])
]);
}

8
app/Http/Controllers/V3/Dashboard/Mission/Report/ReportViolationController.php
View File

@@ -31,7 +31,13 @@ class ReportViolationController extends Controller
{
return $this->successResponse([
'activities' =>$reportService->provinceActivity($request),
'city' => City::query()->where('province_id', $request->province_id)->get(['id', 'name_fa']),
'city' => City::query()
->where('province_id', $request->province_id)
->where(function ($query) {
$query->where('type_id', 1)
->orWhereIn('name_fa', ['اداره ماشين‌آلات', 'اداره نقلیه']);
})
->get(['id', 'name_fa'])
]);
}

2
app/Providers/AppServiceProvider.php
View File

@@ -25,6 +25,6 @@ class AppServiceProvider extends ServiceProvider
public function boot()
{
Schema::defaultStringLength(191);
\URL::forceScheme('https');
// \URL::forceScheme('https');
}
}

2
app/Providers/RouteServiceProvider.php
View File

@@ -70,7 +70,7 @@ class RouteServiceProvider extends ServiceProvider
Route::prefix('api/v3')
->name('v3.')
->middleware(['web', 'auth', 'confirmUser'])
// ->middleware(['web', 'auth', 'confirmUser'])
->namespace($this->namespace)
->group(base_path('routes/v3.php'));

48
app/Services/Cartables/Mission/Report/ReportTradodService.php
View File

@@ -27,7 +27,8 @@ class ReportTradodService
public function countryActivity(Request $request): array
{
$from = $request->from_date ?? today()->startOfDay();
$to = Carbon::parse($request->to_date)->endOfDay() ?? today()->endOfDay();
$to = $request->to_date ? Carbon::parse($request->to_date)->endOfDay() : today()->endOfDay();
$sql = "
SELECT*
FROM(
@@ -60,8 +61,8 @@ class ReportTradodService
FROM provinces p
LEFT JOIN missions m
ON m.province_id = p.id
AND m.created_at >= :from_m
AND m.created_at <= :to_m
AND m.created_at >= :from_m_1
AND m.created_at <= :to_m_1
GROUP BY p.id
) t
@@ -83,20 +84,20 @@ class ReportTradodService
FROM provinces p
LEFT JOIN missions m
ON m.province_id = p.id
AND m.created_at >= :from_m
AND m.created_at <= :to_m
AND m.created_at >= :from_m_2
AND m.created_at <= :to_m_2
GROUP BY p.id, p.name_fa
)q
) q
ORDER BY
CASE WHEN province_id = -1 THEN 0 ELSE 1 END,
province_name;
";
return DB::select($sql, [
'from_m' => $from,
'to_m' => $to,
'from_m_1' => $from,
'to_m_1' => $to,
'from_m_2' => $from,
'to_m_2' => $to,
]);
}
@@ -104,7 +105,7 @@ class ReportTradodService
{
$provinceId = $request->province_id ?? auth()->user()->province_id;
$from = $request->from_date ?? today()->startOfDay();
$to = Carbon::parse($request->to_date)->endOfDay() ?? today()->endOfDay();
$to = $request->to_date ? Carbon::parse($request->to_date)->endOfDay() : today()->endOfDay();
$sql = "
SELECT*
@@ -125,7 +126,6 @@ class ReportTradodService
FROM (
SELECT
c.id AS city_id,
COUNT(m.id) AS total,
COALESCE(SUM(m.mission_duration != m.in_area_duration), 0) AS khareg_mahdode,
COALESCE(SUM(m.in_area_duration), 0) AS gps,
@@ -139,9 +139,9 @@ class ReportTradodService
FROM cities c
LEFT JOIN missions m
ON m.city_id = c.id
AND m.created_at >= :from_m
AND m.created_at <= :to_m
WHERE c.province_id = :province_id
AND m.created_at >= :from_m_1
AND m.created_at <= :to_m_1
WHERE c.province_id = :province_id_1
AND (
c.type_id = 1
OR c.name_fa IN ('اداره ماشين‌آلات', 'اداره نقلیه')
@@ -154,7 +154,6 @@ class ReportTradodService
SELECT
c.name_fa AS city_name,
c.id AS city_id,
COUNT(m.id) AS total,
COALESCE(SUM(m.mission_duration != m.in_area_duration), 0) AS khareg_mahdode,
COALESCE(SUM(m.in_area_duration), 0) AS gps,
@@ -165,13 +164,12 @@ class ReportTradodService
COALESCE(SUM(m.type = 4), 0) AS un_far_d,
COALESCE(SUM(m.category_id = 1), 0) AS item,
COALESCE(SUM(m.category_id = 2), 0) AS patrol
FROM cities c
LEFT JOIN missions m
ON m.city_id = c.id
AND m.created_at >= :from_m
AND m.created_at <= :to_m
WHERE c.province_id = :province_id
AND m.created_at >= :from_m_2
AND m.created_at <= :to_m_2
WHERE c.province_id = :province_id_2
AND (
c.type_id = 1
OR c.name_fa IN ('اداره ماشين‌آلات', 'اداره نقلیه')
@@ -181,13 +179,15 @@ class ReportTradodService
ORDER BY
CASE WHEN q.city_id = -1 THEN 0 ELSE 1 END,
q.city_name;
";
return DB::select($sql, [
'province_id' => $provinceId,
'from_m' => $from,
'to_m' => $to,
'province_id_1' => $provinceId,
'from_m_1' => $from,
'to_m_1' => $to,
'province_id_2' => $provinceId,
'from_m_2' => $from,
'to_m_2' => $to,
]);
}
}

46
app/Services/Cartables/Mission/Report/ReportViolationService.php
View File

@@ -27,7 +27,8 @@ class ReportViolationService
public function countryActivity(Request $request): array
{
$from = $request->from_date ?? today()->startOfDay();
$to = Carbon::parse($request->to_date)->endOfDay() ?? today()->endOfDay();
// اصلاحیه برای جلوگیری از خطا در صورت null بودن to_date
$to = $request->to_date ? Carbon::parse($request->to_date)->endOfDay() : today()->endOfDay();
$sql = "
SELECT*
@@ -54,8 +55,8 @@ class ReportViolationService
LEFT JOIN mission_violations mv
ON mv.province_id = p.id
AND mv.type = 1
AND mv.created_at >= :from_mv
AND mv.created_at <= :to_mv
AND mv.created_at >= :from_mv_1
AND mv.created_at <= :to_mv_1
GROUP BY p.id
) t
@@ -70,24 +71,24 @@ class ReportViolationService
COALESCE(SUM(CASE WHEN gps = 1 THEN 1 ELSE 0 END), 0) as gps,
COALESCE(SUM(CASE WHEN gps = 0 THEN 1 ELSE 0 END), 0) as herasat,
COALESCE(SUM(CASE WHEN gps = 1 THEN mileage ELSE 0 END),0) as mil_gps
FROM provinces p
LEFT JOIN mission_violations mv
ON mv.province_id = p.id
AND mv.type = 1
AND mv.created_at >= :from_mv
AND mv.created_at <= :to_mv
AND mv.created_at >= :from_mv_2
AND mv.created_at <= :to_mv_2
GROUP BY p.id, p.name_fa
)q
) q
ORDER BY
CASE WHEN province_id = -1 THEN 0 ELSE 1 END,
province_name;
";
return DB::select($sql, [
'from_mv' => $from,
'to_mv' => $to,
'from_mv_1' => $from,
'to_mv_1' => $to,
'from_mv_2' => $from,
'to_mv_2' => $to,
]);
}
@@ -95,7 +96,8 @@ class ReportViolationService
{
$provinceId = $request->province_id ?? auth()->user()->province_id;
$from = $request->from_date ?? today()->startOfDay();
$to = Carbon::parse($request->to_date)->endOfDay() ?? today()->endOfDay();
// اصلاحیه برای جلوگیری از خطا در صورت null بودن to_date
$to = $request->to_date ? Carbon::parse($request->to_date)->endOfDay() : today()->endOfDay();
$sql = "
SELECT*
@@ -122,9 +124,9 @@ class ReportViolationService
LEFT JOIN mission_violations mv
ON mv.city_id = c.id
AND mv.type = 1
AND mv.created_at >= :from_mv
AND mv.created_at <= :to_mv
WHERE c.province_id = :province_id
AND mv.created_at >= :from_mv_1
AND mv.created_at <= :to_mv_1
WHERE c.province_id = :province_id_1
AND (
c.type_id = 1
OR c.name_fa IN ('اداره ماشين‌آلات', 'اداره نقلیه')
@@ -147,9 +149,9 @@ class ReportViolationService
LEFT JOIN mission_violations mv
ON mv.city_id = c.id
AND mv.type = 1
AND mv.created_at >= :from_mv
AND mv.created_at <= :to_mv
WHERE c.province_id = :province_id
AND mv.created_at >= :from_mv_2
AND mv.created_at <= :to_mv_2
WHERE c.province_id = :province_id_2
AND (
c.type_id = 1
OR c.name_fa IN ('اداره ماشين‌آلات', 'اداره نقلیه')
@@ -159,13 +161,15 @@ class ReportViolationService
ORDER BY
CASE WHEN q.city_id = -1 THEN 0 ELSE 1 END,
q.city_name;
";
return DB::select($sql, [
'province_id' => $provinceId,
'from_mv' => $from,
'to_mv' => $to,
'province_id_1' => $provinceId,
'from_mv_1' => $from,
'to_mv_1' => $to,
'province_id_2' => $provinceId,
'from_mv_2' => $from,
'to_mv_2' => $to,
]);
}
}

20
routes/v3.php
View File

@@ -539,21 +539,21 @@ Route::prefix('missions')
->name('reportsViolation.')
->controller(ReportViolationController::class)
->group(function () {
Route::get('/country_activity', 'countryActivity')->name('countryActivity')
->middleware('permission:mission-report-country');
Route::get('/province_activity', 'provinceActivity')->name('provinceActivity')
->middleware('permission:mission-report-province');
Route::get('/country_activity', 'countryActivity')->name('countryActivity');
// ->middleware('permission:mission-report-country');
Route::get('/province_activity', 'provinceActivity')->name('provinceActivity');
// ->middleware('permission:mission-report-province');
Route::get('/country_excel_activity', 'countryExcelActivity')->name('countryExcelActivity');
Route::get('/province_excel_activity', 'provinceExcelActivity')->name('provinceExcelActivity');
});
Route::prefix('report_tradod')
->name('reportsTradod.')
Route::prefix('report_taradod')
->name('reportsTaradod.')
->controller(ReportTradodController::class)
->group(function () {
Route::get('/country_activity', 'countryActivity')->name('countryActivity')
->middleware('permission:mission-report-country');
Route::get('/province_activity', 'provinceActivity')->name('provinceActivity')
->middleware('permission:mission-report-province');
Route::get('/country_activity', 'countryActivity')->name('countryActivity');
// ->middleware('permission:mission-report-country');
Route::get('/province_activity', 'provinceActivity')->name('provinceActivity');
// ->middleware('permission:mission-report-province');
Route::get('/country_excel_activity', 'countryExcelActivity')->name('countryExcelActivity');
Route::get('/province_excel_activity', 'provinceExcelActivity')->name('provinceExcelActivity');
});