From d2b925ff834e81c0b3526d62d1bc96bb8cc1daaa Mon Sep 17 00:00:00 2001 From: Pusdatin BPKD Jkt Date: Wed, 7 Sep 2022 16:43:27 +0700 Subject: [PATCH] Bugs Fix --- app/Http/Controllers/ItemSearchController.php | 4 ++- .../RealisasiBelanjaController.php | 31 ++++++++++++++--- resources/views/home.blade.php | 2 +- .../form_input_realisasi.blade.php | 33 ++++++++++++------- .../views/realisasi_belanja/index.blade.php | 2 +- .../views/realisasi_belanja/submit.blade.php | 4 +-- 6 files changed, 55 insertions(+), 21 deletions(-) diff --git a/app/Http/Controllers/ItemSearchController.php b/app/Http/Controllers/ItemSearchController.php index b4ce83b..c66c065 100644 --- a/app/Http/Controllers/ItemSearchController.php +++ b/app/Http/Controllers/ItemSearchController.php @@ -142,11 +142,13 @@ class ItemSearchController extends Controller if (!empty($search)){ $sps->whereRaw(" (LOWER(KODE_REKENING) LIKE '%$search%' OR LOWER(NAMA_REKENING) LIKE '%$search%') "); } - + if ($jenis == "dbh"){ $sps->whereRaw(" (SUBSTR(KODE_REKENING,1,12)='4.2.01.01.01') "); }else if($jenis == "dak"){ $sps->whereRaw(" (SUBSTR(KODE_REKENING,1,12)='4.2.01.01.03' OR SUBSTR(KODE_REKENING,1,12)='4.2.01.01.04') "); + }else{ + $sps->whereRaw(" (SUBSTR(KODE_REKENING,1,3)='4.2') "); } $sps->orderby("KODE_REKENING"); diff --git a/app/Http/Controllers/RealisasiBelanjaController.php b/app/Http/Controllers/RealisasiBelanjaController.php index c67d325..6c96582 100644 --- a/app/Http/Controllers/RealisasiBelanjaController.php +++ b/app/Http/Controllers/RealisasiBelanjaController.php @@ -95,9 +95,9 @@ class RealisasiBelanjaController extends Controller WHERE y.I_IDRSK='.$BelanjaRealisasi->kode_rsk.' GROUP BY x.I_ID, x.I_SP2DNO_DOK,x.D_SP2D_SAH ORDER BY x.D_SP2D_SAH ' ) ); $unitSatuan = UnitSatuan::orderBy("id")->get(); - $jmlRealisasi = DB::select(DB::raw("SELECT sum(REALISASI) as jml FROM NEWSIPKD.VW_BKU_REALISASI_RSK WHERE IDRSK = ".$BelanjaRealisasi->kode_rsk)); - $jmlRealisasi = $jmlRealisasi[0]->jml; - return view('realisasi_belanja.submit', compact("BelanjaRealisasi","BelanjaRealisasiDetail","BelanjaRealisasiKontrak","vwAKB","vwSPD","vwSP2D","unitSatuan","jmlRealisasi")); + $jmlRealisasi1 = $this->getRealisasi($BelanjaRealisasi->kode_rsk, 1); + $jmlRealisasi2 = $this->getRealisasi($BelanjaRealisasi->kode_rsk, 2); + return view('realisasi_belanja.submit', compact("BelanjaRealisasi","BelanjaRealisasiDetail","BelanjaRealisasiKontrak","vwAKB","vwSPD","vwSP2D","unitSatuan","jmlRealisasi1","jmlRealisasi2")); } public function datatable(Request $request) @@ -112,8 +112,14 @@ class RealisasiBelanjaController extends Controller $skpd = isset($post["skpd"])?$post["skpd"]:""; $subkeg = isset($post["subkeg"])?$post["subkeg"]:""; - $sqlStr = "SELECT x.* + $sqlStr = "SELECT x.*,x1.jml FROM BELANJA_REALISASI x + LEFT JOIN ( + SELECT I_IDRSK,SUM(V_SPP) as jml + FROM NEWSIPKD.V_SPPBLJRSK + WHERE D_SP2D_SAH IS NOT NULL AND C_ANGG_TAHUN = $ta + GROUP BY I_IDRSK + ) x1 ON x.kode_rsk = x1.I_IDRSK LEFT JOIN NEWSIPKD.TROPD z ON x.KODE_SKPD = z.C_OPD WHERE x.tahun_anggaran='$ta'"; @@ -312,6 +318,23 @@ class RealisasiBelanjaController extends Controller return view('realisasi_belanja.upload'); } + public function getRealisasi($kdRsk,$sms=1) + { + $semester = ""; + if($sms==1) + { + $semester = "SEMESTER 1"; + $filter = " AND D_POSTING BETWEEN '".getTA()."0101' AND '".getTA()."0630' "; + }else{ + $semester = "SEMESTER 2"; + $filter = " AND D_POSTING BETWEEN '".getTA()."0101' AND '".getTA()."1231' "; + } + $jmlRealisasi = DB::select(DB::raw("SELECT sum(REALISASI) as jml FROM NEWSIPKD.VW_BKU_REALISASI_RSK + WHERE IDRSK = ".$kdRsk.$filter)); + + return $jmlRealisasi[0]->jml; + } + public function inputRealisasi(Request $request, $id) { $req = $request->all(); diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index 0938a70..e680c91 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -6,7 +6,7 @@

S I D A T A

Sistem Informasi Dana Transfer

-
Tahun Anggaran {{ !empty(Session::get('Tahun_Anggaran'))?Session::get('Tahun_Anggaran'):date("Y") }}
Badan Pengelola Keuangan Daerah
Provinsi DKI Jakarta
+
Tahun Anggaran {{ !empty(Session::get('Tahun_Anggaran'))?Session::get('Tahun_Anggaran'):date("Y") }}
Badan Pengelolaan Keuangan Daerah
Provinsi DKI Jakarta
@stop \ No newline at end of file diff --git a/resources/views/realisasi_belanja/form_input_realisasi.blade.php b/resources/views/realisasi_belanja/form_input_realisasi.blade.php index 844b43c..a2809d1 100644 --- a/resources/views/realisasi_belanja/form_input_realisasi.blade.php +++ b/resources/views/realisasi_belanja/form_input_realisasi.blade.php @@ -43,17 +43,26 @@ \ No newline at end of file diff --git a/resources/views/realisasi_belanja/index.blade.php b/resources/views/realisasi_belanja/index.blade.php index 7bde32f..2fdd41f 100644 --- a/resources/views/realisasi_belanja/index.blade.php +++ b/resources/views/realisasi_belanja/index.blade.php @@ -264,7 +264,7 @@ $("td:eq(4)", nRow).html("
"+aData["kode_rsk"]+" | "+aData["nama_rsk"]+"
"); $("td:eq(5)", nRow).html(separateNumberIndo(aData["jumlah_anggaran"])); $("td:eq(6)", nRow).html(separateNumberIndo(aData["volume_satuan"])); - $("td:eq(8)", nRow).html(separateNumberIndo(aData["jumlah_realisasi"])); + $("td:eq(8)", nRow).html(separateNumberIndo(aData["jml"])); $("td:eq(9)", nRow).html(separateNumberIndo(aData["volume_satuan_realisasi"])); $("td:eq(11)", nRow).html(''+btnInput); diff --git a/resources/views/realisasi_belanja/submit.blade.php b/resources/views/realisasi_belanja/submit.blade.php index 076ed08..0ebcbb0 100644 --- a/resources/views/realisasi_belanja/submit.blade.php +++ b/resources/views/realisasi_belanja/submit.blade.php @@ -250,7 +250,7 @@
- +
@@ -269,7 +269,7 @@
- +