juan.zapata/repuve-backend-v1
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: mejorar lógica de filtrado y asignación de tags en constanciasSustituida

Browse Source
This commit is contained in:
Juan Felipe Zapata Moreno 2026-04-03 15:18:17 -06:00
parent 706625575c
commit e272b60c43
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/Http/Controllers/Repuve/ExcelController.php
View File

@ -335,11 +335,17 @@ public function constanciasSustituidas(Request $request)
->whereNotNull('cancellation_at') ->whereNotNull('cancellation_at')
->whereBetween('cancellation_at', [$fechaInicio, $fechaFin]); ->whereBetween('cancellation_at', [$fechaInicio, $fechaFin]);
}) })
// sustitucion_primera_vez: un solo log sin cancellation_at, filtrar por created_at // sustitucion_primera_vez activo: un solo log sin cancellation_at, filtrar por created_at
->orWhere(function ($q) use ($fechaInicio, $fechaFin) { ->orWhere(function ($q) use ($fechaInicio, $fechaFin) {
$q->where('action_type', 'sustitucion_primera_vez') $q->where('action_type', 'sustitucion_primera_vez')
->whereNull('cancellation_at') ->whereNull('cancellation_at')
->whereBetween('created_at', [$fechaInicio, $fechaFin]); ->whereBetween('created_at', [$fechaInicio, $fechaFin]);
})
// sustitucion_primera_vez cancelado: fue el tag viejo en una sustitución posterior
->orWhere(function ($q) use ($fechaInicio, $fechaFin) {
$q->where('action_type', 'sustitucion_primera_vez')
->whereNotNull('cancellation_at')
->whereBetween('cancellation_at', [$fechaInicio, $fechaFin]);
}); });
}) })
->when($moduleId, function ($query) use ($moduleId) { ->when($moduleId, function ($query) use ($moduleId) {
@ -356,8 +362,8 @@ public function constanciasSustituidas(Request $request)
// PREPARACIÓN DE DATOS // PREPARACIÓN DE DATOS
$data = $logs->map(function ($log) { $data = $logs->map(function ($log) {
// sustitucion_primera_vez: un solo log, el log mismo ES el nuevo TAG asignado // sustitucion_primera_vez activo (sin cancellation_at): el log mismo ES el nuevo TAG asignado
if ($log->action_type === 'sustitucion_primera_vez') { if ($log->action_type === 'sustitucion_primera_vez' && is_null($log->cancellation_at)) {
return [ return [
'niv' => $log->vehicle->niv ?? '', 'niv' => $log->vehicle->niv ?? '',
'nrpv' => $log->vehicle->nrpv ?? '', 'nrpv' => $log->vehicle->nrpv ?? '',
@ -376,9 +382,8 @@ public function constanciasSustituidas(Request $request)
$newTagLog = VehicleTagLog::with('tag') $newTagLog = VehicleTagLog::with('tag')
->where('vehicle_id', $log->vehicle_id) ->where('vehicle_id', $log->vehicle_id)
->whereIn('action_type', ['sustitucion_primera_vez', 'sustitucion']) ->whereIn('action_type', ['sustitucion_primera_vez', 'sustitucion'])
->whereNull('cancellation_at')
->where('id', '!=', $log->id) ->where('id', '!=', $log->id)
->where('created_at', '>=', $log->created_at) ->where('created_at', '>=', $log->cancellation_at ?? $log->created_at)
->orderBy('created_at', 'asc') ->orderBy('created_at', 'asc')
->first(); ->first();
@ -407,8 +412,8 @@ public function constanciasSustituidas(Request $request)
'placa' => $log->vehicle->placa ?? '', 'placa' => $log->vehicle->placa ?? '',
'modelo' => $log->vehicle->modelo ?? '', 'modelo' => $log->vehicle->modelo ?? '',
'folio_ant' => $folioAnt, 'folio_ant' => $folioAnt,
'folio_act' => $newTagLog?->tag?->folio ?? '', 'folio_act' => $newTagLog?->tag?->folio ?? $log->tag->folio ?? '',
'chip' => substr($newTagLog?->tag?->rfid ?? $newTagLog?->tag?->tag_number ?? '', 0, 24), 'chip' => substr($newTagLog?->tag?->rfid ?? $newTagLog?->tag?->tag_number ?? $log->tag->rfid ?? $log->tag->tag_number ?? '', 0, 24),
'fecha' => $log->cancellation_at?->format('d/m/Y') ?? $log->created_at->format('d/m/Y'), 'fecha' => $log->cancellation_at?->format('d/m/Y') ?? $log->created_at->format('d/m/Y'),
'observaciones' => $log->cancellationReason?->name ?? $log->cancellation_observations ?? '', 'observaciones' => $log->cancellationReason?->name ?? $log->cancellation_observations ?? '',
]; ];