Merge branch 'dev'

This commit is contained in:
izuddin
2025-03-21 08:55:35 +07:00
30 changed files with 63 additions and 60 deletions
+3 -3
View File
@@ -12,7 +12,7 @@ class BelanjaRealisasi extends Eloquent
use HasFactory;
use Uuids;
protected $connection = 'Samasa';
protected $table = 'SAMASA.belanja_realisasi';
protected $table = 'belanja_realisasi';
protected $fillable = [
"tahun_anggaran",
"jenis_belanja",
@@ -99,7 +99,7 @@ class BelanjaRealisasi extends Eloquent
) b ON a.kode_rsk = b.I_IDRSK
LEFT JOIN (
SELECT id_rsk,count(id_rsk) as jml_spd
FROM SAMASA.belanja_realisasi_spd
FROM belanja_realisasi_spd
WHERE TO_CHAR(TGL,'YYYY') = $ta
GROUP BY id_rsk
) c ON a.kode_rsk = c.id_rsk
@@ -157,7 +157,7 @@ class BelanjaRealisasi extends Eloquent
) b ON a.kode_rsk = b.I_IDRSK
LEFT JOIN (
SELECT id_rsk,SUM(jumlah) as jml_spd
FROM SAMASA.belanja_realisasi_spd
FROM belanja_realisasi_spd
WHERE TO_CHAR(TGL,'YYYY') = $ta
GROUP BY id_rsk
) c ON a.kode_rsk = c.id_rsk