From 33829f711a7ac9c01463f0b65728ab87562ec1df Mon Sep 17 00:00:00 2001 From: Pusdatin BPKD Jkt Date: Tue, 20 Dec 2022 10:23:30 +0700 Subject: [PATCH] Bugs Fix Kode Rekening dan SPS Input Data Realisasi Belanja --- app/Http/Controllers/ItemSearchController.php | 2 +- .../RealisasiBelanjaController.php | 118 +++++++----------- 2 files changed, 47 insertions(+), 73 deletions(-) diff --git a/app/Http/Controllers/ItemSearchController.php b/app/Http/Controllers/ItemSearchController.php index 216f993..d7d3e62 100644 --- a/app/Http/Controllers/ItemSearchController.php +++ b/app/Http/Controllers/ItemSearchController.php @@ -49,7 +49,7 @@ class ItemSearchController extends Controller if($request->has('q')){ $search = strtolower($request->q); - $sqlStr.= " AND LOWER(x.NAMA_SKPD) LIKE '%$search%' "; + $sqlStr.= " AND ( LOWER(x.NAMA_SKPD) LIKE '%$search%' OR x.KODE_SKPD LIKE '%$search%' )"; } $tropd = DB::select(DB::raw($sqlStr." ORDER BY x.KODE_SKPD ")); diff --git a/app/Http/Controllers/RealisasiBelanjaController.php b/app/Http/Controllers/RealisasiBelanjaController.php index 2a01354..2adfe07 100644 --- a/app/Http/Controllers/RealisasiBelanjaController.php +++ b/app/Http/Controllers/RealisasiBelanjaController.php @@ -98,6 +98,50 @@ class RealisasiBelanjaController extends Controller ]); } + protected function inputDataRealisasi($request) + { + $req = $request->all(); + $VwDpaRsk = VwDpaRsk::where("I_ID",$req["rsk"])->first(); + + $input = [ + "tahun_anggaran"=>getTA(), + "jenis_belanja"=>$req["jenis"], + "sub_jenis_belanja"=>isset($req["sub_jenis"])?$req["sub_jenis"]:0, + "kode_program"=>$VwDpaRsk["c_program"], + "nama_program"=>$VwDpaRsk["n_program"], + "kode_skpd"=>$VwDpaRsk["c_opd"], + "nama_skpd"=>$VwDpaRsk["n_opd"], + "kode_kegiatan"=>$VwDpaRsk["c_giat"], + "nama_kegiatan"=>$VwDpaRsk["n_giat"], + "kode_sub_kegiatan"=>$VwDpaRsk["c_subgiat"], + "nama_sub_kegiatan"=>$VwDpaRsk["n_subgiat"], + "kode_rsk"=>$VwDpaRsk["i_id"], + "nama_rsk"=>$VwDpaRsk["n_rsk"], + "kode_rekening"=>null, + "nama_rekening"=>null, + "jumlah_anggaran"=>$VwDpaRsk["v_angg_tapd"], + "alokasi_anggaran"=>replaceMoney($req["alokasi_anggaran"]), + "volume_satuan"=>replaceMoney($req["vol"]), + "unit_satuan"=>$req["unit"], + "jml_rencana_kontrak"=>isset($req["jml_rencana_kontrak"])?$req["jml_rencana_kontrak"]:0, + "jenis_dana"=>$req["jenis_dana"], + "sub_jenis_dana"=>$req["sub_jenis_dana"], + "id_sps"=>isset($req["id_sps"])?$req["id_sps"]:0, + "created_by"=>Auth::user()->id + ]; + + if (isset($req["id_sps"])) + { + $sps = Sps_pendapatan::where("ID", $req["id_sps"])->firstorNew(); + if ($sps){ + $input["kode_rekening"] = $sps["kode_rekening"]; + $input["nama_rekening"] = $sps["nama_rekening"]; + } + } + + return $input; + } + public function store(Request $request) { $request->validate([ @@ -110,45 +154,9 @@ class RealisasiBelanjaController extends Controller //"id_sps"=>"required", // Karena ada yg tidak memakai SPS ]); - $req = $request->all(); - $VwDpaRsk = VwDpaRsk::where("I_ID",$req["rsk"])->first(); try{ DB::beginTransaction(); - - $input = [ - "tahun_anggaran"=>getTA(), - "jenis_belanja"=>$req["jenis"], - "sub_jenis_belanja"=>isset($req["sub_jenis"])?$req["sub_jenis"]:0, - "kode_program"=>$VwDpaRsk["c_program"], - "nama_program"=>$VwDpaRsk["n_program"], - "kode_skpd"=>$VwDpaRsk["c_opd"], - "nama_skpd"=>$VwDpaRsk["n_opd"], - "kode_kegiatan"=>$VwDpaRsk["c_giat"], - "nama_kegiatan"=>$VwDpaRsk["n_giat"], - "kode_sub_kegiatan"=>$VwDpaRsk["c_subgiat"], - "nama_sub_kegiatan"=>$VwDpaRsk["n_subgiat"], - "kode_rsk"=>$VwDpaRsk["i_id"], - "nama_rsk"=>$VwDpaRsk["n_rsk"], - "jumlah_anggaran"=>$VwDpaRsk["v_angg_tapd"], - "alokasi_anggaran"=>replaceMoney($req["alokasi_anggaran"]), - "volume_satuan"=>replaceMoney($req["vol"]), - "unit_satuan"=>$req["unit"], - "jml_rencana_kontrak"=>isset($req["jml_rencana_kontrak"])?$req["jml_rencana_kontrak"]:0, - "jenis_dana"=>$req["jenis_dana"], - "sub_jenis_dana"=>$req["sub_jenis_dana"], - "id_sps"=>isset($req["id_sps"])?$req["id_sps"]:0, - "created_by"=>Auth::user()->id - ]; - - if (isset($req["id_sps"])) - { - $sps = Sps_pendapatan::where("ID", $req["id_sps"])->firstorNew(); - if ($sps){ - $input["kode_rekening"] = $sps["kode_rekening"]; - $input["nama_rekening"] = $sps["nama_rekening"]; - } - } - + $input = $this->inputDataRealisasi($request); BelanjaRealisasi::create($input); DB::commit(); @@ -184,43 +192,9 @@ class RealisasiBelanjaController extends Controller //"id_sps"=>"required", ]); - $req = $request->all(); - $VwDpaRsk = VwDpaRsk::where("I_ID",$req["rsk"])->first(); try{ DB::beginTransaction(); - - $input = [ - "tahun_anggaran"=>getTA(), - "jenis_belanja"=>isset($req["jenis"])?$req["jenis"]:0, - "sub_jenis_belanja"=>isset($req["sub_jenis"])?$req["sub_jenis"]:0, - "kode_program"=>$VwDpaRsk["c_program"], - "nama_program"=>$VwDpaRsk["n_program"], - "kode_skpd"=>$VwDpaRsk["c_opd"], - "nama_skpd"=>$VwDpaRsk["n_opd"], - "kode_kegiatan"=>$VwDpaRsk["c_giat"], - "nama_kegiatan"=>$VwDpaRsk["n_giat"], - "kode_sub_kegiatan"=>$VwDpaRsk["c_subgiat"], - "nama_sub_kegiatan"=>$VwDpaRsk["n_subgiat"], - "kode_rsk"=>$VwDpaRsk["i_id"], - "nama_rsk"=>$VwDpaRsk["n_rsk"], - "jumlah_anggaran"=>$VwDpaRsk["v_angg_tapd"], - "alokasi_anggaran"=>replaceMoney($req["alokasi_anggaran"]), - "volume_satuan"=>isset($req["vol"])?replaceMoney($req["vol"]):0, - "unit_satuan"=>isset($req["unit"])?$req["unit"]:0, - "jml_rencana_kontrak"=>isset($req["jml_rencana_kontrak"])?$req["jml_rencana_kontrak"]:0, - "jenis_dana"=>$req["jenis_dana"], - "sub_jenis_dana"=>isset($req["sub_jenis_dana"])?$req["sub_jenis_dana"]:0, - "id_sps"=>isset($req["id_sps"])?$req["id_sps"]:0 - ]; - - if (isset($req["id_sps"])) - { - $sps = Sps_pendapatan::where("ID", $req["id_sps"])->firstorNew(); - if ($sps){ - $input["kode_rekening"] = $sps["kode_rekening"]; - $input["nama_rekening"] = $sps["nama_rekening"]; - } - } + $input = $this->inputDataRealisasi($request); $realisasi_belanja->update($input); DB::commit();