From 58683bcfca1668aa80d70eef91adc2f5edfdca72 Mon Sep 17 00:00:00 2001 From: izuddin Date: Tue, 18 Feb 2025 11:56:50 +0700 Subject: [PATCH 1/2] Bugs Fix Input STS berdasarkan Kode Akun --- app/Http/Controllers/ItemSearchController.php | 2 + app/Models/AkbSpb23.php | 107 +++++++++++++----- .../views/realisasi_pendapatan/show.blade.php | 2 +- sql.txt | 2 +- 4 files changed, 81 insertions(+), 32 deletions(-) diff --git a/app/Http/Controllers/ItemSearchController.php b/app/Http/Controllers/ItemSearchController.php index 6d90da6..585e3b9 100644 --- a/app/Http/Controllers/ItemSearchController.php +++ b/app/Http/Controllers/ItemSearchController.php @@ -182,10 +182,12 @@ class ItemSearchController extends Controller public function sts(Request $request) { $no_skprd = $request->no_skprd; + $kode_akun = $request->kode_akun; $select = DB::raw("NO_SKPRD,TGL_VALIDASI,KODE_BAS,NILAI_BAYAR,TRBAS.N_AKUN"); $sts = Siesetpembayaran::select($select) ->join("NEWSIPKD.TRBAS", "SI_ESET_PEMBAYARAN.KODE_BAS", "=", "TRBAS.C_AKUN") ->where("NO_SKPRD", $no_skprd) + ->where("SI_ESET_PEMBAYARAN.C_AKUN", $kode_akun) ->whereRaw("C_TAHUN_BERLAKU<=" . getTA() . " AND C_TAHUN_BERAKHIR>=" . getTA()) ->first(); if ($sts) { diff --git a/app/Models/AkbSpb23.php b/app/Models/AkbSpb23.php index 66e606f..a63e146 100644 --- a/app/Models/AkbSpb23.php +++ b/app/Models/AkbSpb23.php @@ -12,38 +12,85 @@ class AkbSpb23 extends Eloquent use HasFactory; protected $connection = 'mysql'; + // public function getAkbPendapatan() + // { + // $sqlstr = "select + // D.tahun, + // D.unitkerja_id, + // D.komisi as unitkerja_komisi, + // D.kode_wilayah as unitkerja_wilayah, + // D.kode as Unitkerja_Kode, + // D.kode_permen as Unitkerja_kodepermen, + // D.nama as Unitkerja_nama, + // C.rekening_id as rek_id, + // C.kode as rek_kode, + // C.nama as rek_nama, + // B.nilai, + // coalesce(A.bulan1, 0) as bulan1, + // coalesce(A.bulan2, 0) as bulan2, + // coalesce(A.bulan3, 0) as bulan3, + // coalesce(A.bulan4, 0) as bulan4, + // coalesce(A.bulan5, 0) as bulan5, + // coalesce(A.bulan6, 0) as bulan6, + // coalesce(A.bulan7, 0) as bulan7, + // coalesce(A.bulan8, 0) as bulan8, + // coalesce(A.bulan9, 0) as bulan9, + // coalesce(A.bulan10, 0) as bulan10, + // coalesce(A.bulan11, 0) as bulan11, + // coalesce(A.bulan12, 0) as bulan12 + // from next_pendapatan B + // left join next_pendapatan_proyeksi A on A.pendapatan_id = B.pendapatan_id + // join hist2_rekening C on B.rekening_id = C.rekening_id and C.tahun = ".getTA()." + // join hist_unitkerja D on B.unitkerja_id = D.unitkerja_id and D.tahun = ".getTA()." + // ORDER BY C.kode"; + + // return DB::connection("mysql")->select(DB::raw($sqlstr)); + // } + public function getAkbPendapatan() { - $sqlstr = "select - D.tahun, - D.unitkerja_id, - D.komisi as unitkerja_komisi, - D.kode_wilayah as unitkerja_wilayah, - D.kode as Unitkerja_Kode, - D.kode_permen as Unitkerja_kodepermen, - D.nama as Unitkerja_nama, - C.rekening_id as rek_id, - C.kode as rek_kode, - C.nama as rek_nama, - B.nilai, - coalesce(A.bulan1, 0) as bulan1, - coalesce(A.bulan2, 0) as bulan2, - coalesce(A.bulan3, 0) as bulan3, - coalesce(A.bulan4, 0) as bulan4, - coalesce(A.bulan5, 0) as bulan5, - coalesce(A.bulan6, 0) as bulan6, - coalesce(A.bulan7, 0) as bulan7, - coalesce(A.bulan8, 0) as bulan8, - coalesce(A.bulan9, 0) as bulan9, - coalesce(A.bulan10, 0) as bulan10, - coalesce(A.bulan11, 0) as bulan11, - coalesce(A.bulan12, 0) as bulan12 - from next_pendapatan B - left join next_pendapatan_proyeksi A on A.pendapatan_id = B.pendapatan_id - join hist2_rekening C on B.rekening_id = C.rekening_id and C.tahun = ".getTA()." - join hist_unitkerja D on B.unitkerja_id = D.unitkerja_id and D.tahun = ".getTA()." - ORDER BY C.kode"; + // UNTUK 2024 + // $sqlstr = "SELECT + // I_IDOPD unitkerja_id, + // y.N_AKUN rek_nama, + // y.C_AKUN rek_kode, + // V_ANGG_TAPD nilai, + // V_SPS_BULAN01 bulan1, + // V_SPS_BULAN02 bulan2, + // V_SPS_BULAN03 bulan3, + // V_SPS_BULAN04 bulan4, + // V_SPS_BULAN05 bulan5, + // V_SPS_BULAN06 bulan6, + // V_SPS_BULAN07 bulan7, + // V_SPS_BULAN08 bulan8, + // V_SPS_BULAN09 bulan9, + // V_SPS_BULAN10 bulan10, + // V_SPS_BULAN11 bulan11, + // V_SPS_BULAN12 bulan12 + // FROM NEWSIPKD.TMDPADPT x + // LEFT JOIN NEWSIPKD.TRBAS y ON x.I_IDBAS = y.I_ID + // WHERE C_ANGG_TAHUN = ".getTA().""; - return DB::connection("mysql")->select(DB::raw($sqlstr)); + $sqlstr = "SELECT + unitkerja_id, + NAMA_REKENING rek_nama, + KODE_REKENING rek_kode, + REK_ANGGARAN nilai, + BULAN1, + BULAN2, + BULAN3, + BULAN4, + BULAN5, + BULAN6, + BULAN7, + BULAN8, + BULAN9, + BULAN10, + BULAN11, + BULAN12 + FROM SYNCHRO.P_SPB_PENDAPATANAKB + WHERE TAHUN= ".getTA().""; + + return DB::connection("oracle")->select(DB::raw($sqlstr)); } } diff --git a/resources/views/realisasi_pendapatan/show.blade.php b/resources/views/realisasi_pendapatan/show.blade.php index f899ae8..7c382f9 100644 --- a/resources/views/realisasi_pendapatan/show.blade.php +++ b/resources/views/realisasi_pendapatan/show.blade.php @@ -117,7 +117,7 @@ $(".loading").show(); let stat = false; $.ajax({ - url: '{{ $baseUrl }}/item-search-sts?no_skprd='+$("#rkud_no_sts").val(), + url: '{{ $baseUrl }}/item-search-sts?no_skprd='+$("#rkud_no_sts").val()+'&kode_akun='+$("#txt_id_sps").val(), dataType: 'json', async: false, success: function (data) { diff --git a/sql.txt b/sql.txt index 92dec29..55b1cc6 100644 --- a/sql.txt +++ b/sql.txt @@ -173,7 +173,7 @@ FROM BAPEDA_BUDGETING.SPB_PENDAPATANAKB_24@EBUDGETING WHERE TAHUN = 2024 AND NOT EXISTS ( SELECT 1 - FROM AKB_PENDAPATAN dest + FROM SAMSA.AKB_PENDAPATAN dest WHERE TAHUN = 2024 AND UNITKERJA_ID = dest.SKPD_ID AND KODEREKENING = dest.KODE_REKENING From c0230b056b7d8355963fadf493aa603ff87ff2d2 Mon Sep 17 00:00:00 2001 From: izuddin Date: Tue, 18 Feb 2025 12:04:46 +0700 Subject: [PATCH 2/2] Bugs Fix --- app/Http/Controllers/ItemSearchController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/ItemSearchController.php b/app/Http/Controllers/ItemSearchController.php index 585e3b9..1382759 100644 --- a/app/Http/Controllers/ItemSearchController.php +++ b/app/Http/Controllers/ItemSearchController.php @@ -187,7 +187,7 @@ class ItemSearchController extends Controller $sts = Siesetpembayaran::select($select) ->join("NEWSIPKD.TRBAS", "SI_ESET_PEMBAYARAN.KODE_BAS", "=", "TRBAS.C_AKUN") ->where("NO_SKPRD", $no_skprd) - ->where("SI_ESET_PEMBAYARAN.C_AKUN", $kode_akun) + ->where("SI_ESET_PEMBAYARAN.KODE_BAS", $kode_akun) ->whereRaw("C_TAHUN_BERLAKU<=" . getTA() . " AND C_TAHUN_BERAKHIR>=" . getTA()) ->first(); if ($sts) {