Smart/smartEnergyView-backend
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Incorrect order, it's sorting by month, you need to sort by month+year and bring the current year + previous year.

Browse Source
This commit is contained in:
Djonathan 2022-07-06 18:26:43 -03:00
parent 19e1f52e14
commit d6d41184df
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Repositories/DadosTe/DadosTeRepository.php
View File

@ -4,6 +4,7 @@ declare(strict_types=1);
namespace App\Repositories\DadosTe; namespace App\Repositories\DadosTe;
use App\Helpers\Helpers;
use App\Models\DadosTe; use App\Models\DadosTe;
use App\Repositories\AbstractRepository; use App\Repositories\AbstractRepository;
use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Builder;
@ -34,7 +35,7 @@ class DadosTeRepository extends AbstractRepository implements DadosTeContractInt
public function getOperationSummary($params): Collection|array public function getOperationSummary($params): Collection|array
{ {
$fields = [ $fields = [
DB::raw("TO_CHAR(TO_DATE(dados_te.mes, 'YYMM'), 'MM/YYYY') as mes"), "dados_te.mes",
'dados_te.cod_smart_unidade', 'dados_te.cod_smart_unidade',
'dados_te.operacao', 'dados_te.operacao',
'dados_te.tipo', 'dados_te.tipo',
@ -44,7 +45,12 @@ class DadosTeRepository extends AbstractRepository implements DadosTeContractInt
'dados_te.nf_c_icms' 'dados_te.nf_c_icms'
]; ];
return $this->execute($fields, $params)->get(); $result = $this->execute($fields, $params)
->whereRaw("TO_DATE(dados_te.mes, 'YYMM') >= TO_DATE(TO_CHAR(current_date , 'YYYY-01-01'), 'YYYY-MM-DD') - INTERVAL '1' year")
->orderBy('mes', 'DESC')
->get();
return Helpers::orderByDate($result);
} }
public static function filterRow($params, $field = 'mes'): array public static function filterRow($params, $field = 'mes'): array