From 8d556a19c94e43c5371eb6f28276ff3a037c173c Mon Sep 17 00:00:00 2001 From: Pusdatin BPKD Jkt Date: Fri, 6 Jan 2023 17:10:22 +0700 Subject: [PATCH] AKB --- .../Controllers/JadwalSalurdanaController.php | 15 ++++++++++----- .../Controllers/RealisasiBelanjaController.php | 11 +---------- app/Models/BelanjaRealisasi.php | 14 ++++++++++++++ resources/views/jadwal_salurdana/index.blade.php | 4 ++-- .../views/jadwal_salurdana/index_cht.blade.php | 4 ++-- .../views/jadwal_salurdana/index_dak.blade.php | 8 ++++---- 6 files changed, 33 insertions(+), 23 deletions(-) diff --git a/app/Http/Controllers/JadwalSalurdanaController.php b/app/Http/Controllers/JadwalSalurdanaController.php index 2da7541..160881e 100644 --- a/app/Http/Controllers/JadwalSalurdanaController.php +++ b/app/Http/Controllers/JadwalSalurdanaController.php @@ -8,6 +8,7 @@ use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Auth; use Maatwebsite\Excel\Facades\Excel; use App\Models\Sps_pendapatan; +use App\Models\BelanjaRealisasi; use PhpOffice\PhpSpreadsheet\Spreadsheet; use PhpOffice\PhpSpreadsheet\Writer\Xlsx; @@ -49,7 +50,9 @@ class JadwalSalurdanaController extends Controller $sqlstr.=" AND SUBSTR(x.kode_rekening,1,12) IN ('4.2.01.01.03','4.2.01.01.04')"; } } - $data = DB::select(DB::raw($sqlstr.'ORDER BY x.kode_rekening OFFSET '.$offset.' ROWS FETCH NEXT '.$limit.' ROWS ONLY')); + + $sqlLimit = $limit > 0?" OFFSET ".$offset." ROWS FETCH NEXT ".$limit." ROWS ONLY ":""; + $data = DB::select(DB::raw($sqlstr.'ORDER BY x.kode_rekening '.$sqlLimit)); $dataFilter = count(DB::select(DB::raw($sqlstr))); return response()->json([ @@ -63,7 +66,7 @@ class JadwalSalurdanaController extends Controller { $judul = strtoupper($typeDana); $this->setTitle("Jadwal Salur Dana $judul"); - $filter = $typeDana == "cht" ? " AND x.jenis_dana = 'DBH' AND x.sub_jenis_dana = 2 ": " AND x.jenis_dana = 'DAK'"; + $filter = $typeDana == "cht" ? " AND x.jenis_dana = 'DBH' AND x.sub_jenis_dana = 3 ": " AND x.jenis_dana = 'DAK'"; if (getRole()=="skpd"){ $filter.=" AND x.kode_skpd='".Auth::user()->nrk."'"; } @@ -79,8 +82,9 @@ class JadwalSalurdanaController extends Controller $dataAkbRealisasi = DB::select(DB::raw("SELECT x.kode_skpd, x.nama_skpd, x.kode_rsk, x.nama_rsk, x.jumlah_anggaran, y.* FROM SAMASA.BELANJA_REALISASI x - LEFT JOIN SAMASA.MV_ASYNC_AKB_REALISASI y - ON x.KODE_RSK = y.I_IDRSK AND x.TAHUN_ANGGARAN = y.C_ANGG_TAHUN + LEFT JOIN (".BelanjaRealisasi::akbRealisasi().") y + ON x.KODE_RSK = y.I_IDRSK + -- AND x.TAHUN_ANGGARAN = y.C_ANGG_TAHUN WHERE x.TAHUN_ANGGARAN = ".getTa()." $filter ORDER BY x.kode_skpd,x.nama_skpd,x.kode_rsk ")); @@ -109,7 +113,8 @@ class JadwalSalurdanaController extends Controller if (getRole()=="skpd"){ $sqlstr.=" AND KODE_SKPD='".Auth::user()->nrk."'"; } - $data = DB::select(DB::raw($sqlstr.' ORDER BY x.kode_skpd,x.kode_rsk OFFSET '.$offset.' ROWS FETCH NEXT '.$limit.' ROWS ONLY')); + $sqlLimit = $limit > 0?" OFFSET ".$offset." ROWS FETCH NEXT ".$limit." ROWS ONLY ":""; + $data = DB::select(DB::raw($sqlstr.' ORDER BY x.kode_skpd,x.kode_rsk '.$sqlLimit)); $dataTotal = count(DB::select(DB::raw($sqlstr))); // if (!empty($src)){ //$data->whereRaw("(LOWER(NAMA_REKENING) LIKE '%".strtolower($src)."%' OR LOWER(KODE_REKENING) LIKE '%".strtolower($src)."%')"); diff --git a/app/Http/Controllers/RealisasiBelanjaController.php b/app/Http/Controllers/RealisasiBelanjaController.php index 7717b60..afefa34 100644 --- a/app/Http/Controllers/RealisasiBelanjaController.php +++ b/app/Http/Controllers/RealisasiBelanjaController.php @@ -247,16 +247,7 @@ class RealisasiBelanjaController extends Controller public function submit_akb_spd(VwBelanjaRealisasi $BelanjaRealisasi) { - $vwAKB = DB::select(DB::raw( - "SELECT I_IDRSK,SUM(V_AKB_01) AS V_AKB_01,SUM(V_AKB_02) AS V_AKB_02,SUM(V_AKB_03) AS V_AKB_03,SUM(V_AKB_04) AS V_AKB_04,SUM(V_AKB_05) AS V_AKB_05, - SUM(V_AKB_06) AS V_AKB_06,SUM(V_AKB_07) AS V_AKB_07,SUM(V_AKB_08) AS V_AKB_08,SUM(V_AKB_09) AS V_AKB_09,SUM(V_AKB_10) AS V_AKB_10, - SUM(V_AKB_11) AS V_AKB_11,SUM(V_AKB_12) AS V_AKB_12, - SUM(V_BKU_01) AS V_BKU_01,SUM(V_BKU_02) AS V_BKU_02,SUM(V_BKU_03) AS V_BKU_03,SUM(V_BKU_04) AS V_BKU_04,SUM(V_BKU_05) AS V_BKU_05, - SUM(V_BKU_06) AS V_BKU_06,SUM(V_BKU_07) AS V_BKU_07,SUM(V_BKU_08) AS V_BKU_08,SUM(V_BKU_09) AS V_BKU_09,SUM(V_BKU_10) AS V_BKU_10, - SUM(V_BKU_11) AS V_BKU_11,SUM(V_BKU_12) AS V_BKU_12 - FROM MV_ASYNC_AKB_REALISASI WHERE I_IDRSK = ".$BelanjaRealisasi->kode_rsk." - GROUP BY I_IDRSK " - )); + $vwAKB = DB::select(DB::raw("SELECT * FROM (".BelanjaRealisasi::akbRealisasi().") x WHERE I_IDRSK = ".$BelanjaRealisasi->kode_rsk)); $vwAKB = json_decode(json_encode($vwAKB[0]), true); $vwSPD = []; diff --git a/app/Models/BelanjaRealisasi.php b/app/Models/BelanjaRealisasi.php index 53baee2..5c3e5ef 100644 --- a/app/Models/BelanjaRealisasi.php +++ b/app/Models/BelanjaRealisasi.php @@ -104,4 +104,18 @@ class BelanjaRealisasi extends Eloquent return $sqlstr; } + + public function akbRealisasi() + { + $ta = getTA(); + $sqlstr = "SELECT I_IDRSK,SUM(V_AKB_01) AS V_AKB_01,SUM(V_AKB_02) AS V_AKB_02,SUM(V_AKB_03) AS V_AKB_03,SUM(V_AKB_04) AS V_AKB_04,SUM(V_AKB_05) AS V_AKB_05, + SUM(V_AKB_06) AS V_AKB_06,SUM(V_AKB_07) AS V_AKB_07,SUM(V_AKB_08) AS V_AKB_08,SUM(V_AKB_09) AS V_AKB_09,SUM(V_AKB_10) AS V_AKB_10, + SUM(V_AKB_11) AS V_AKB_11,SUM(V_AKB_12) AS V_AKB_12, + SUM(V_BKU_01) AS V_BKU_01,SUM(V_BKU_02) AS V_BKU_02,SUM(V_BKU_03) AS V_BKU_03,SUM(V_BKU_04) AS V_BKU_04,SUM(V_BKU_05) AS V_BKU_05, + SUM(V_BKU_06) AS V_BKU_06,SUM(V_BKU_07) AS V_BKU_07,SUM(V_BKU_08) AS V_BKU_08,SUM(V_BKU_09) AS V_BKU_09,SUM(V_BKU_10) AS V_BKU_10, + SUM(V_BKU_11) AS V_BKU_11,SUM(V_BKU_12) AS V_BKU_12 + FROM MV_ASYNC_AKB_REALISASI GROUP BY I_IDRSK"; + + return $sqlstr; + } } diff --git a/resources/views/jadwal_salurdana/index.blade.php b/resources/views/jadwal_salurdana/index.blade.php index 4d3e81c..3c9bf63 100644 --- a/resources/views/jadwal_salurdana/index.blade.php +++ b/resources/views/jadwal_salurdana/index.blade.php @@ -183,8 +183,8 @@ ], "dom": "<\"top\" <\"row\"<\"col-md-6\"l><\"col-md-6 text-right\"B>>>rt<\"bottom\" <\"row\"<\"col-md-6\"i><\"col-md-6\"p>> ><\"clear\">", "lengthMenu": [ - [ 50, 75, 100 ], - [ "50", "75", "100" ] + [ 50, 75, 100, -1 ], + [ "50", "75", "100", "All" ] ], "paging": true, // Table pagination "columns": [ diff --git a/resources/views/jadwal_salurdana/index_cht.blade.php b/resources/views/jadwal_salurdana/index_cht.blade.php index 4caa4d2..76f03b4 100644 --- a/resources/views/jadwal_salurdana/index_cht.blade.php +++ b/resources/views/jadwal_salurdana/index_cht.blade.php @@ -235,8 +235,8 @@ { "width": "400px", "targets": 2 } ], "lengthMenu": [ - [ 10, 25, 50 ], - [ "10", "25", "50" ] + [ 10, 25, 50,-1 ], + [ "10", "25", "50", "All" ] ], "paging": true, // Table pagination "language": { diff --git a/resources/views/jadwal_salurdana/index_dak.blade.php b/resources/views/jadwal_salurdana/index_dak.blade.php index f81cc99..e91348a 100644 --- a/resources/views/jadwal_salurdana/index_dak.blade.php +++ b/resources/views/jadwal_salurdana/index_dak.blade.php @@ -272,8 +272,8 @@ { "width": "400px", "targets": 2 } ], "lengthMenu": [ - [ 10, 25, 50 ], - [ "10", "25", "50" ] + [ 10, 25, 50, -1 ], + [ "10", "25", "50", "All" ] ], "paging": true, // Table pagination "language": { @@ -341,8 +341,8 @@ ], "dom": "<\"top\" <\"row\"<\"col-md-6\"l><\"col-md-6 text-right\"B>>>rt<\"bottom\" <\"row\"<\"col-md-6\"i><\"col-md-6\"p>> ><\"clear\">", "lengthMenu": [ - [ 10, 20, 50 ], - [ "10", "20", "50" ] + [ 10, 20, 50,-1 ], + [ "10", "20", "50","All" ] ], "paging": true, // Table pagination "columns": [