From 937afce4b8a878b0697fa3e36fd029f8673403df Mon Sep 17 00:00:00 2001 From: izuddin Date: Tue, 15 Jul 2025 10:17:59 +0700 Subject: [PATCH] Update --- app/Http/Controllers/Admin/RolessController.php | 4 ++-- app/Http/Controllers/ItemSearchController.php | 2 +- app/Http/Controllers/JadwalSalurdanaController.php | 2 +- app/Http/Controllers/LaporanFileController.php | 2 +- .../Controllers/RealisasiBelanjaController.php | 2 +- app/Models/Sps_pendapatan.php | 2 +- .../2014_10_12_000000_create_users_table.php | 8 ++++++++ sql.txt | 14 +++++++------- 8 files changed, 22 insertions(+), 14 deletions(-) diff --git a/app/Http/Controllers/Admin/RolessController.php b/app/Http/Controllers/Admin/RolessController.php index 01f4ee9..9e0757a 100644 --- a/app/Http/Controllers/Admin/RolessController.php +++ b/app/Http/Controllers/Admin/RolessController.php @@ -16,10 +16,10 @@ class RolessController extends Controller public function index() { - $data = Roless::where("name","<>","superadmin")->latest()->paginate(10); + $data = Roless::where("name","<>","superadmin")->orderBy("id")->paginate(15); return view('admin.mst_role.index',compact('data')) - ->with('i', (request()->input('page', 1) - 1) * 10); + ->with('i', (request()->input('page', 1) - 1) * 15); } public function create() diff --git a/app/Http/Controllers/ItemSearchController.php b/app/Http/Controllers/ItemSearchController.php index 0b862e1..93f614f 100644 --- a/app/Http/Controllers/ItemSearchController.php +++ b/app/Http/Controllers/ItemSearchController.php @@ -47,7 +47,7 @@ class ItemSearchController extends Controller if (getRole() == "sbpk") { $sqlStr .= " AND y.C_WIL_SP2DPROSES=" . Auth::user()->wilayah; - } elseif (getRole() == "walikota") { + } elseif (getRole() == "walikota" || getRole() == "induk skpd") { $id = Tropd::where("C_OPD", Auth::user()->nrk)->first()["i_id"]; $sqlStr .= " AND x.KODE_SKPD IN (SELECT C_OPD FROM NEWSIPKD.TROPD WHERE I_IDINDUK=" . $id . ")"; } diff --git a/app/Http/Controllers/JadwalSalurdanaController.php b/app/Http/Controllers/JadwalSalurdanaController.php index 2c88954..ea4b705 100644 --- a/app/Http/Controllers/JadwalSalurdanaController.php +++ b/app/Http/Controllers/JadwalSalurdanaController.php @@ -73,7 +73,7 @@ class JadwalSalurdanaController extends Controller if (getRole() == "skpd") { $sqlstr .= " AND KODE_SKPD='" . Auth::user()->nrk . "'"; - } elseif (getRole() == "walikota") { + } elseif (getRole() == "walikota" || getRole() == "induk skpd") { $id = Tropd::where("C_OPD", Auth::user()->nrk)->first()["i_id"]; $sqlstr .= " AND KODE_SKPD IN (SELECT C_OPD FROM NEWSIPKD.TROPD WHERE I_IDINDUK=" . $id . ")"; } else { diff --git a/app/Http/Controllers/LaporanFileController.php b/app/Http/Controllers/LaporanFileController.php index 042a643..0378128 100644 --- a/app/Http/Controllers/LaporanFileController.php +++ b/app/Http/Controllers/LaporanFileController.php @@ -157,7 +157,7 @@ class LaporanFileController extends Controller $data->where(function ($subquery) { $subquery->whereIn("kode_rekening", MappingDbhSkpd::whereIn("kode_skpd", [Auth::user()->nrk])->pluck("kode_rekening")); }); - } elseif (getRole() == "walikota") { + } elseif (getRole() == "walikota" || getRole() == "induk skpd") { $id = Tropd::where("C_OPD", Auth::user()->nrk)->first()["i_id"]; $data->whereIn("kode_skpd", function ($query) use ($id) { $query->select('C_OPD') diff --git a/app/Http/Controllers/RealisasiBelanjaController.php b/app/Http/Controllers/RealisasiBelanjaController.php index 00f7bd7..08f0a64 100644 --- a/app/Http/Controllers/RealisasiBelanjaController.php +++ b/app/Http/Controllers/RealisasiBelanjaController.php @@ -381,7 +381,7 @@ class RealisasiBelanjaController extends Controller $filter .= " AND KODE_SKPD='" . Auth::user()->nrk . "'"; } elseif (getRole() == "sbpk") { $filter .= " AND KODE_SKPD IN (SELECT C_OPD FROM NEWSIPKD.TROPD WHERE C_WIL_SP2DPROSES=" . Auth::user()->wilayah . ")"; - } elseif (getRole() == "walikota") { + } elseif (getRole() == "walikota" || getRole() == "induk skpd") { $id = Tropd::where("C_OPD", Auth::user()->nrk)->first()["i_id"]; $filter .= " AND KODE_SKPD IN (SELECT C_OPD FROM NEWSIPKD.TROPD WHERE I_IDINDUK=" . $id . ")"; } diff --git a/app/Models/Sps_pendapatan.php b/app/Models/Sps_pendapatan.php index 7c15c03..8d838f1 100644 --- a/app/Models/Sps_pendapatan.php +++ b/app/Models/Sps_pendapatan.php @@ -22,7 +22,7 @@ class Sps_pendapatan extends Eloquent $sqlstr .= ' WHERE x.kode_rekening IN (SELECT kode_rekening FROM MAPPING_DBH_SKPD WHERE KODE_SKPD=\'' . Auth::user()->nrk . '\') '; } elseif (getRole() == "sbpk") { $sqlstr .= ' WHERE x.kode_rekening IN (SELECT kode_rekening FROM MAPPING_DBH_SKPD WHERE KODE_SKPD IN (SELECT C_OPD FROM NEWSIPKD.TROPD WHERE C_WIL_SP2DPROSES=' . Auth::user()->wilayah . '))'; - } elseif (getRole() == "walikota") { + } elseif (getRole() == "walikota" || getRole() == "induk skpd") { $sqlstr .= ' WHERE x.kode_rekening IN (SELECT kode_rekening FROM MAPPING_DBH_SKPD WHERE KODE_SKPD IN (SELECT C_OPD FROM NEWSIPKD.TROPD WHERE I_IDINDUK = (SELECT I_ID FROM NEWSIPKD.TROPD WHERE C_OPD=\'' . Auth::user()->nrk . '\')))'; } else { $sqlstr .= " WHERE 1=1 "; diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php index 806c851..1fe838c 100644 --- a/database/migrations/2014_10_12_000000_create_users_table.php +++ b/database/migrations/2014_10_12_000000_create_users_table.php @@ -23,6 +23,14 @@ class CreateUsersTable extends Migration $table->tinyInteger('is_lock_upload')->nullable(); $table->timestamp('lock_upload_time')->nullable(); $table->string('lock_upload_by')->nullable(); + $table->tinyInteger('wilayah')->nullable(); + $table->tinyInteger('lock_tambah_data')->nullable(); + $table->tinyInteger('lock_ubah_data')->nullable(); + $table->tinyInteger('lock_hapus_data')->nullable(); + $table->tinyInteger('check_all_ubah')->nullable(); + $table->tinyInteger('check_all_hapus')->nullable(); + $table->string('kode_skpd',25)->nullable(); + $table->string('kode_induk_skpd',25)->nullable(); $table->rememberToken(); $table->timestamps(); }); diff --git a/sql.txt b/sql.txt index 44d580f..c3d0117 100644 --- a/sql.txt +++ b/sql.txt @@ -132,7 +132,7 @@ BEGIN DBMS_SNAPSHOT.REFRESH('Name here'); END; -INSERT INTO AKB_PENDAPATAN( +INSERT INTO SAMASA.AKB_PENDAPATAN( TAHUN, SKPD_ID, KODE_REKENING, @@ -156,7 +156,7 @@ SELECT UNITKERJA_ID, KODEREKENING, NAMAREKENING, - REK_ANGGARAN, + rek_anggaran_perubahan REK_ANGGARAN, BULAN1, BULAN2, BULAN3, @@ -169,12 +169,12 @@ SELECT BULAN10, BULAN11, BULAN12 -FROM BAPEDA_BUDGETING.SPB_PENDAPATANAKB_24@EBUDGETING -WHERE TAHUN = 2024 +FROM BAPEDA_BUDGETING.P_SPB_PENDAPATANAKB@EBUDGETING +WHERE TAHUN = 2025 AND NOT EXISTS ( SELECT 1 - FROM SAMSA.AKB_PENDAPATAN dest - WHERE TAHUN = 2024 + FROM SAMASA.AKB_PENDAPATAN dest + WHERE TAHUN = 2025 AND UNITKERJA_ID = dest.SKPD_ID AND KODEREKENING = dest.KODE_REKENING -); \ No newline at end of file +) AND NVL(rek_anggaran_perubahan,0)>0