From c6c131e91bffde3ffce14b1b1d6dde3b650b5bf8 Mon Sep 17 00:00:00 2001 From: jirho Date: Thu, 2 May 2024 10:54:11 -0300 Subject: [PATCH] fix datos vienen de la ultima dj con join --- app/Http/Controllers/ApiPersonaController.php | 2 +- app/Models/UaderMapuchePersona.php | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/ApiPersonaController.php b/app/Http/Controllers/ApiPersonaController.php index 6292787..87cbb8c 100644 --- a/app/Http/Controllers/ApiPersonaController.php +++ b/app/Http/Controllers/ApiPersonaController.php @@ -55,7 +55,7 @@ class ApiPersonaController extends Controller public function buscar($dni) { - $persona = UaderMapuchePersona::where('nro_docum', $dni)->orderByDesc('id')->first(); + $persona = UaderMapuchePersona::buscarPersonaPorDni($dni); if (!empty($persona)) { $dj = UaderDjPersona::find($persona->id_dj_persona); $datos = array( diff --git a/app/Models/UaderMapuchePersona.php b/app/Models/UaderMapuchePersona.php index 3e81ba1..e01209d 100644 --- a/app/Models/UaderMapuchePersona.php +++ b/app/Models/UaderMapuchePersona.php @@ -39,6 +39,23 @@ class UaderMapuchePersona extends Model return 0; } } + + static public function buscarPersonaPorDni($dni) + { + $persona = DB::table('uader_mapuche_persona') + ->join('uader_dj_persona', 'uader_mapuche_persona.id_dj_persona', '=', 'uader_dj_persona.id') + ->selectRaw('uader_mapuche_persona.id_dj_persona as id_dj') + ->whereRaw("uader_mapuche_persona.nro_docum = '$dni'") + // descomentar cuando termine el periodo de prueba + // ->where('uader_dj_persona.estado', '=', 'C') + ->orderBy('uader_dj_persona.fecha_cierre', 'desc') + ->first(); + if (!empty($persona)) { + return UaderMapuchePersona::where('id_dj_persona', $persona->id_dj)->first(); + } else { + return 0; + } + } }