Merge branch 'dev'

app/Exports/JadwalSalurExport.php

@@ -32,7 +32,7 @@ class JadwalSalurExport implements FromQuery, WithMapping, WithHeadings
                     (
                         SELECT * FROM (
                             SELECT ID_SPS,extract(month from RKUD_TGL) AS BULAN,RKUD_JUMLAH  
-                            FROM SAMASA.PENDAPATAN_REALISASI 
+                            FROM PENDAPATAN_REALISASI 
                             WHERE TAHUN=\''.$this->ta.'\' 
                         )
                         PIVOT

app/Http/Controllers/Admin/MappingDbhSkpdController.php

@@ -60,7 +60,7 @@ class MappingDbhSkpdController extends Controller
     public function show($MappingDbhSkpd)
     {
         $sps = VwRekeningPendapatan::where("id",$MappingDbhSkpd)->firstorNew();
-        $mappingSKPD = DB::select(DB::raw("SELECT x.*,y.N_OPD FROM SAMASA.MAPPING_DBH_SKPD x
+        $mappingSKPD = DB::select(DB::raw("SELECT x.*,y.N_OPD FROM MAPPING_DBH_SKPD x
                                 LEFT JOIN NEWSIPKD.TROPD y ON x.KODE_SKPD = y.C_OPD WHERE x.id_rekening = $MappingDbhSkpd"));
         // MappingDbhSkpd::where("id_sps",$MappingDbhSkpd)->get();
         $this->setSubtitle("Detail Data Mapping");

app/Http/Controllers/ItemSearchController.php

@@ -41,7 +41,7 @@ class ItemSearchController extends Controller
         $search = strtoupper($request->q);
         if ($request->has('realisasi-belanja')) {
             $sqlStr = "SELECT DISTINCT x.KODE_SKPD AS ID,x.KODE_SKPD||' | '||x.NAMA_SKPD as name 
-                    FROM SAMASA.BELANJA_REALISASI x 
+                    FROM BELANJA_REALISASI x 
                     LEFT JOIN NEWSIPKD.TROPD y ON x.KODE_SKPD = y.C_OPD 
                     WHERE TAHUN_ANGGARAN = $ta ";
 
@@ -153,8 +153,8 @@ class ItemSearchController extends Controller
             }
 
             $sps = DB::select(DB::raw("SELECT x.KODE_REKENING as IDX,x.KODE_REKENING||' | '||z.NAMA_REKENING as name 
-                FROM SAMASA.MAPPING_DBH_SKPD x
+                FROM MAPPING_DBH_SKPD x
-                LEFT JOIN SAMASA.VW_REKENING_PENDAPATAN z ON x.ID_REKENING = z.ID 
+                LEFT JOIN VW_REKENING_PENDAPATAN z ON x.ID_REKENING = z.ID 
                 WHERE x.kode_skpd='" . Auth::user()->nrk . "' AND (TAHUN_BERLAKU<=" . getTA() . " AND TAHUN_BERAKHIR>=" . getTA() . ") $filter"));
         } else {
             $select = DB::raw("KODE_REKENING AS IDX,KODE_REKENING||' | '||NAMA_REKENING as name");

app/Http/Controllers/JadwalSalurdanaController.php

@@ -66,8 +66,8 @@ class JadwalSalurdanaController extends Controller
         $where .= !empty($idSPS) ? " AND x.kode_rekening='$idSPS' " : "";
 
         $sqlstr = 'SELECT x.kode_skpd, x.nama_skpd, x.kode_rsk, x.nama_rsk, x.kode_rekening, x.nama_rekening, x.jumlah_anggaran, y.*  
-                    FROM SAMASA.VW_BELANJA_REALISASI x 
+                    FROM VW_BELANJA_REALISASI x 
-                    LEFT JOIN SAMASA.MV_ASYNC_AKB_REALISASI y 
+                    LEFT JOIN MV_ASYNC_AKB_REALISASI y 
                     ON x.KODE_RSK = y.I_IDRSK AND x.TAHUN_ANGGARAN = y.C_ANGG_TAHUN 
                     WHERE x.TAHUN_ANGGARAN = \'' . $ta . '\'' . $where;
 

app/Http/Controllers/RealisasiBelanjaController.php

@@ -51,10 +51,13 @@ class RealisasiBelanjaController extends Controller
             abort(403, 'Tidak diperbolehkan menambah data oleh admin!');
         }
         $get = $request->all();
-        $rskExists = BelanjaRealisasi::where("kode_rsk", $get["rsk"])->count();
+        $rskExists = BelanjaRealisasi::where("tahun_anggaran",getTA())
+                    ->where("kode_skpd",Auth::user()->kode_skpd)
+                    ->where("kode_rsk", $get["rsk"])
+                    ->count();
         if ($rskExists > 0) {
             return redirect(URL::to("/realisasi-belanja"))
-                ->with('error', 'Data dengan RSK yand dipilih sudah ada!');
+                ->with('error', 'Data dengan RSK yang dipilih sudah ada!');
         }
 
         $VwDpaRsk = VwDpaRsk::where("I_ID", $get["rsk"])->first();
@@ -77,7 +80,7 @@ class RealisasiBelanjaController extends Controller
         $src = isset($post["search"]["value"]) ? strtolower($post["search"]["value"]) : "";
         $skpd = "";
 
-        $sqlStr = "SELECT * FROM SAMASA.VW_DPA_RSK WHERE C_ANGG_TAHUN=" . getTA();
+        $sqlStr = "SELECT * FROM VW_DPA_RSK WHERE C_ANGG_TAHUN=" . getTA();
 
         if (getRole() == "skpd") {
             $sqlStr .= " AND C_OPD='" . Auth::user()->nrk . "'";
@@ -253,7 +256,7 @@ class RealisasiBelanjaController extends Controller
 
     public function submit(Request $request, $id)
     {
-        $BelanjaRealisasi = DB::select(DB::raw("SELECT * FROM SAMASA.VW_BELANJA_REALISASI WHERE ID='$id'"));
+        $BelanjaRealisasi = DB::select(DB::raw("SELECT * FROM VW_BELANJA_REALISASI WHERE ID='$id'"));
         $BelanjaRealisasi = $BelanjaRealisasi[0];
 
         $this->setTitle("Realisasi Belanja");
@@ -288,7 +291,7 @@ class RealisasiBelanjaController extends Controller
     public function submit_akb_spd(VwBelanjaRealisasi $BelanjaRealisasi)
     {
 
-        $vwAKB = DB::select(DB::raw("SELECT * FROM SAMASA.MV_ASYNC_AKB_REALISASI x WHERE I_IDRSK = " . $BelanjaRealisasi->kode_rsk));
+        $vwAKB = DB::select(DB::raw("SELECT * FROM MV_ASYNC_AKB_REALISASI x WHERE I_IDRSK = " . $BelanjaRealisasi->kode_rsk));
         if ($vwAKB) {
             $vwAKB = json_decode(json_encode($vwAKB[0]), true);
         } else {
@@ -424,7 +427,7 @@ class RealisasiBelanjaController extends Controller
 
         $dataFilter = DB::select(DB::raw("SELECT COUNT(ID) as JML FROM VW_BELANJA_REALISASI " . $this->tableFilter($request)));
         $dataTotal = BelanjaRealisasi::where("tahun_anggaran", $ta)->count();
-        $sqlStr = "SELECT * FROM SAMASA.VW_DPA_RSK WHERE C_ANGG_TAHUN=" . getTA();
+        $sqlStr = "SELECT * FROM VW_DPA_RSK WHERE C_ANGG_TAHUN=" . getTA();
         if (getRole() == "skpd") {
             $dataTotal = BelanjaRealisasi::where("tahun_anggaran", $ta)->whereRaw("KODE_SKPD='" . Auth::user()->nrk . "'")->count();
         } elseif (getRole() == "sbpk") {
@@ -619,7 +622,7 @@ class RealisasiBelanjaController extends Controller
     public function ubahSPD(Request $request, $id)
     {
         $req = $request->all();
-        $detailRSK = DB::select(DB::raw("SELECT * FROM SAMASA.VW_DPA_RSK WHERE I_ID = $id"));
+        $detailRSK = DB::select(DB::raw("SELECT * FROM VW_DPA_RSK WHERE I_ID = $id"));
         $detailRSK = json_decode(json_encode($detailRSK[0]), true);
         $SPDs = BelanjaRealisasi::getSPD($detailRSK["c_subgiat"], $detailRSK["i_idopd"]);
 
@@ -785,7 +788,7 @@ class RealisasiBelanjaController extends Controller
                                     FROM NEWSIPKD.TMSP2D x 
                                     LEFT JOIN NEWSIPKD.TMSPPRINCIBLJRSK y 
                                     ON x.I_IDSPP = y.I_IDSPP 
-                                    LEFT JOIN SAMASA.DBH_BELANJA_REALISASI_DETAIL a 
+                                    LEFT JOIN DBH_BELANJA_REALISASI_DETAIL a 
                                     ON x.I_SP2DNO_DOK = a.NO_SP2D 
                                     WHERE y.I_IDRSK = ' . $request->id . ' ORDER BY x.D_SP2D_SAH ')
         );

app/Models/AkbPendapatan.php

@@ -11,7 +11,7 @@ class AkbPendapatan extends Eloquent
 {
     use HasFactory;
     protected $connection = 'Samasa';
-    protected $table = 'SAMASA.AKB_PENDAPATAN';
+    protected $table = 'AKB_PENDAPATAN';
     protected $guarded = [];
     public $timestamps = false;
 }

app/Models/BelanjaRealisasi.php

@@ -12,7 +12,7 @@ class BelanjaRealisasi extends Eloquent
     use HasFactory;
     use Uuids;
     protected $connection = 'Samasa';
-    protected $table = 'SAMASA.belanja_realisasi';
+    protected $table = 'belanja_realisasi';
     protected $fillable = [
         "tahun_anggaran",
         "jenis_belanja",
@@ -99,7 +99,7 @@ class BelanjaRealisasi extends Eloquent
                 ) b ON a.kode_rsk = b.I_IDRSK 
                 LEFT JOIN (
                     SELECT id_rsk,count(id_rsk) as jml_spd 
-                    FROM SAMASA.belanja_realisasi_spd 
+                    FROM belanja_realisasi_spd 
                     WHERE TO_CHAR(TGL,'YYYY') = $ta
                     GROUP BY id_rsk 
                 ) c ON a.kode_rsk = c.id_rsk 
@@ -157,7 +157,7 @@ class BelanjaRealisasi extends Eloquent
                 ) b ON a.kode_rsk = b.I_IDRSK 
                 LEFT JOIN (
                     SELECT id_rsk,SUM(jumlah) as jml_spd 
-                    FROM SAMASA.belanja_realisasi_spd 
+                    FROM belanja_realisasi_spd 
                     WHERE TO_CHAR(TGL,'YYYY') = $ta
                     GROUP BY id_rsk 
                 ) c ON a.kode_rsk = c.id_rsk 

app/Models/BelanjaRealisasiBast.php

@@ -10,7 +10,7 @@ class BelanjaRealisasiBast extends Eloquent
 {
     use HasFactory;
     protected $connection = 'Samasa';
-    protected $table = 'SAMASA.belanja_realisasi_bast';
+    protected $table = 'belanja_realisasi_bast';
     protected $fillable = [
         "id_kontrak",
         "nomor_bast",

app/Models/BelanjaRealisasiDetail.php

@@ -10,7 +10,7 @@ class BelanjaRealisasiDetail extends Eloquent
 {
     use HasFactory;
     protected $connection = 'Samasa';
-    protected $table = 'SAMASA.belanja_realisasi_detail';
+    protected $table = 'belanja_realisasi_detail';
     protected $fillable = [
         "belanja_realisasi_id",
         "jumlah_realisasi",

app/Models/BelanjaRealisasiKontrak.php

@@ -10,7 +10,7 @@ class BelanjaRealisasiKontrak extends Eloquent
 {
     use HasFactory;
     protected $connection = 'Samasa';
-    protected $table = 'SAMASA.belanja_realisasi_kontrak';
+    protected $table = 'belanja_realisasi_kontrak';
     protected $fillable = [
         "belanja_realisasi_id",
         "nomor_kontrak",

app/Models/BelanjaRealisasiRinci.php

@@ -10,7 +10,7 @@ class BelanjaRealisasiRinci extends Eloquent
 {
     use HasFactory;
     protected $connection = 'Samasa';
-    protected $table = 'SAMASA.belanja_realisasi_rinci';
+    protected $table = 'belanja_realisasi_rinci';
     protected $fillable = [
         "belanja_realisasi_id",
         "jumlah_realisasi_1",

app/Models/BelanjaRealisasiRinciDau.php

@@ -8,7 +8,7 @@ class BelanjaRealisasiRinciDau extends Eloquent
 {
     use HasFactory;
     protected $connection = 'Samasa';
-    protected $table = 'SAMASA.belanja_realisasi_rinci_dau';
+    protected $table = 'belanja_realisasi_rinci_dau';
     protected $fillable = [
         "belanja_realisasi_id",
         "id_rinci_dau",

app/Models/BelanjaRealisasiSPD.php

@@ -10,7 +10,7 @@ class BelanjaRealisasiSPD extends Eloquent
 {
     use HasFactory;
     protected $connection = 'Samasa';
-    protected $table = 'SAMASA.belanja_realisasi_spd';
+    protected $table = 'belanja_realisasi_spd';
     protected $fillable = [
         "id_rsk",
         "no_spd",

app/Models/LaporanFile.php

@@ -11,7 +11,7 @@ class LaporanFile extends Eloquent
     use HasFactory;
     use Uuids;
     protected $connection = 'Samasa';
-    protected $table = 'SAMASA.laporan_file';
+    protected $table = 'laporan_file';
     protected $fillable = [
         "tahun",
         "tgl_upload",

app/Models/MappingDbhSkpd.php

@@ -10,7 +10,7 @@ class MappingDbhSkpd extends Eloquent
 {
     use HasFactory;
     protected $connection = 'Samasa';
-    protected $table = 'SAMASA.mapping_dbh_skpd';
+    protected $table = 'mapping_dbh_skpd';
     protected $fillable = [
         "id_sps",
         "tahun",

app/Models/MstDauRinci.php

@@ -10,7 +10,7 @@ class MstDauRinci extends Eloquent
 {
     use HasFactory;
     protected $connection = 'Samasa';
-    protected $table = 'SAMASA.MST_DAU_RINCI';
+    protected $table = 'MST_DAU_RINCI';
     protected $fillable = [
         "name",
         "grup",

app/Models/MstJenisBelanja.php

@@ -10,7 +10,7 @@ class MstJenisBelanja extends Eloquent
 {
     use HasFactory;
     protected $connection = 'Samasa';
-    protected $table = 'SAMASA.MST_JENIS_BELANJA';
+    protected $table = 'MST_JENIS_BELANJA';
     protected $fillable = [
         "kode",
         "name",

app/Models/MstJenisDana.php

@@ -10,7 +10,7 @@ class MstJenisDana extends Eloquent
 {
     use HasFactory;
     protected $connection = 'Samasa';
-    protected $table = 'SAMASA.MST_JENIS_DANA';
+    protected $table = 'MST_JENIS_DANA';
     protected $fillable = [
         "name",
         "grup",

app/Models/MstSubJenisBelanja.php

@@ -10,7 +10,7 @@ class MstSubJenisBelanja extends Eloquent
 {
     use HasFactory;
     protected $connection = 'Samasa';
-    protected $table = 'SAMASA.MST_SUB_JENIS_BELANJA';
+    protected $table = 'MST_SUB_JENIS_BELANJA';
     protected $fillable = [
         "kode",
         "id_jenis_belanja",

app/Models/Notifikasi.php

@@ -11,7 +11,7 @@ class Notifikasi extends Eloquent
     use HasFactory;
     use Uuids;
     protected $connection = 'Samasa';
-    protected $table = 'SAMASA.notifikasi';
+    protected $table = 'notifikasi';
     protected $fillable = [
         "role_from",
         "role_to",

app/Models/PendapatanRealisasi.php

@@ -11,7 +11,7 @@ class PendapatanRealisasi extends Eloquent
     use HasFactory;
     use Uuids;
     protected $connection = 'Samasa';
-    protected $table = 'SAMASA.pendapatan_realisasi';
+    protected $table = 'pendapatan_realisasi';
     protected $fillable = [
         'tahun','simtrad4_uraian','simtrad4_kotor','simtrad4_potongan','simtrad4_bersih','simtrad4_tgl_sp2d_bun','simtrad4_sp2d_bun',
         'rkud_tgl','rkud_no_sts','rkud_kode_akun','rkud_nama_akun','rkud_jumlah','id_sps','kode_rekening_sps','nama_rekening_sps','file_sts',

app/Models/SisaSalurDana.php

@@ -11,7 +11,7 @@ class SisaSalurDana extends Eloquent
 {
     use HasFactory;
     protected $connection = 'Samasa';
-    protected $table = 'SAMASA.MST_SISA_SALUR';
+    protected $table = 'MST_SISA_SALUR';
     protected $fillable = [
         "tahun",
         "kode_rekening",

app/Models/Sps_pendapatan.php

@@ -19,11 +19,11 @@ class Sps_pendapatan extends Eloquent
                         LEFT JOIN MST_SISA_SALUR y ON x.TAHUN = y.TAHUN AND x.KODE_REKENING = y.KODE_REKENING';
 
         if (getRole() == "skpd") {
-            $sqlstr .= ' WHERE x.kode_rekening IN (SELECT kode_rekening FROM SAMASA.MAPPING_DBH_SKPD WHERE KODE_SKPD=\'' . Auth::user()->nrk . '\') ';
+            $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 SAMASA.MAPPING_DBH_SKPD WHERE KODE_SKPD IN (SELECT C_OPD FROM NEWSIPKD.TROPD WHERE C_WIL_SP2DPROSES=' . Auth::user()->wilayah . '))';
+            $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") {
-            $sqlstr .= ' WHERE x.kode_rekening IN (SELECT kode_rekening FROM SAMASA.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 . '\')))';
+            $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 ";
         }

app/Models/TempRealisasiBelanja.php

@@ -10,7 +10,7 @@ class TempRealisasiBelanja extends Eloquent
 {
     use HasFactory;
     protected $connection = 'Samasa';
-    protected $table = 'SAMASA.TEMP_REALISASI_BELANJA';
+    protected $table = 'TEMP_REALISASI_BELANJA';
     protected $fillable = [
         "tahun_anggaran",
         "jenis_belanja",

app/Models/VwBelanjaRealisasi.php

@@ -12,5 +12,5 @@ class VwBelanjaRealisasi extends Eloquent
     public $incrementing = false;
     protected $keyType = "string";
     protected $connection = 'Samasa';
-    protected $table = 'Samasa.VW_BELANJA_REALISASI';
+    protected $table = 'VW_BELANJA_REALISASI';
 }

app/Models/VwDpaRsk.php

@@ -10,5 +10,5 @@ class VwDpaRsk extends Eloquent
 {
     use HasFactory;
     protected $connection = 'Samasa';
-    protected $table = 'Samasa.VW_DPA_RSK';
+    protected $table = 'VW_DPA_RSK';
 }

app/Models/VwJadwalSalur.php

@@ -10,5 +10,5 @@ class VwJadwalSalur extends Eloquent
 {
     use HasFactory;
     protected $connection = 'Samasa';
-    protected $table = 'Samasa.VW_JADWAL_SALUR';
+    protected $table = 'VW_JADWAL_SALUR';
 }

app/Models/VwJenisBelanja.php

@@ -10,5 +10,5 @@ class VwJenisBelanja extends Eloquent
 {
     use HasFactory;
     protected $connection = 'Samasa';
-    protected $table = 'Samasa.VW_JENIS_BELANJA';
+    protected $table = 'VW_JENIS_BELANJA';
 }

app/Models/VwRekeningPendapatan.php

@@ -11,6 +11,6 @@ class VwRekeningPendapatan extends Eloquent
 {
     use HasFactory;
     protected $connection = 'oracle';
-    protected $table = 'SAMASA.VW_REKENING_PENDAPATAN';
+    protected $table = 'VW_REKENING_PENDAPATAN';
 
 }

sql.txt

@@ -1,29 +1,29 @@
 CREATE VIEW VW_BELANJA_REALISASI AS 
 SELECT x."ID",x."TAHUN_ANGGARAN",x."JENIS_BELANJA",x."SUB_JENIS_BELANJA",x."KODE_PROGRAM",x."NAMA_PROGRAM",z1."I_ID" AS "ID_SKPD", x."KODE_SKPD",x."NAMA_SKPD",x."KODE_KEGIATAN",x."NAMA_KEGIATAN",x."KODE_SUB_KEGIATAN",x."NAMA_SUB_KEGIATAN",x."KODE_RSK",x."NAMA_RSK",x."KODE_REKENING",x."NAMA_REKENING",x."JUMLAH_ANGGARAN",x."VOLUME_SATUAN",x."UNIT_SATUAN",x."JUMLAH_REALISASI",x."VOLUME_SATUAN_REALISASI",x."UNIT_SATUAN_REALISASI", x."JENIS_DANA",x."SUB_JENIS_DANA",x."REALISASI_BY",x."CREATED_BY",x."CREATED_AT",x."UPDATED_AT",x."JML_RENCANA_KONTRAK",x."ID_SPS", x."ALOKASI_ANGGARAN", y.NAME AS nama_jenis_belanja, z.NAME AS nama_sub_jenis_belanja, f_view_sbpk , y1.NAME AS nama_subjenis_dana 
-FROM SAMASA.belanja_realisasi x 
+FROM belanja_realisasi x 
-LEFT JOIN SAMASA.MST_JENIS_BELANJA y ON x.JENIS_BELANJA = y.ID 
+LEFT JOIN MST_JENIS_BELANJA y ON x.JENIS_BELANJA = y.ID 
-LEFT JOIN SAMASA.MST_JENIS_DANA y1 ON x.SUB_JENIS_DANA = y1.ID 
+LEFT JOIN MST_JENIS_DANA y1 ON x.SUB_JENIS_DANA = y1.ID 
-LEFT JOIN SAMASA.MST_SUB_JENIS_BELANJA z ON x.SUB_JENIS_BELANJA = z.ID 
+LEFT JOIN MST_SUB_JENIS_BELANJA z ON x.SUB_JENIS_BELANJA = z.ID 
 LEFT JOIN NEWSIPKD.TROPD z1 ON x.KODE_SKPD = z1.C_OPD ;
 
 
 CREATE VIEW VW_BELANJA_REALISASI_REPORT AS 
 SELECT 
 x."ID",x."TAHUN_ANGGARAN",x."JENIS_BELANJA",x."SUB_JENIS_BELANJA",x."KODE_PROGRAM",x."NAMA_PROGRAM",z1."I_ID" AS "ID_SKPD", x."KODE_SKPD",x."NAMA_SKPD",x."KODE_KEGIATAN",x."NAMA_KEGIATAN",x."KODE_SUB_KEGIATAN",x."NAMA_SUB_KEGIATAN",x."KODE_RSK",x."NAMA_RSK",x."KODE_REKENING",x."NAMA_REKENING",x."JUMLAH_ANGGARAN",x."VOLUME_SATUAN",x."UNIT_SATUAN",x."JUMLAH_REALISASI",x."VOLUME_SATUAN_REALISASI",x."UNIT_SATUAN_REALISASI", x."JENIS_DANA",x."SUB_JENIS_DANA",x."REALISASI_BY",x."CREATED_BY",x."CREATED_AT",x."UPDATED_AT",x."JML_RENCANA_KONTRAK",x."ID_SPS", x."ALOKASI_ANGGARAN", y.NAME AS nama_jenis_belanja, z.NAME AS nama_sub_jenis_belanja, f_view_sbpk , y1.NAME AS nama_subjenis_dana, '' as keterangan_dau
-FROM SAMASA.belanja_realisasi x 
+FROM belanja_realisasi x 
-LEFT JOIN SAMASA.MST_JENIS_BELANJA y ON x.JENIS_BELANJA = y.ID 
+LEFT JOIN MST_JENIS_BELANJA y ON x.JENIS_BELANJA = y.ID 
-LEFT JOIN SAMASA.MST_JENIS_DANA y1 ON x.SUB_JENIS_DANA = y1.ID 
+LEFT JOIN MST_JENIS_DANA y1 ON x.SUB_JENIS_DANA = y1.ID 
-LEFT JOIN SAMASA.MST_SUB_JENIS_BELANJA z ON x.SUB_JENIS_BELANJA = z.ID 
+LEFT JOIN MST_SUB_JENIS_BELANJA z ON x.SUB_JENIS_BELANJA = z.ID 
 LEFT JOIN NEWSIPKD.TROPD z1 ON x.KODE_SKPD = z1.C_OPD 
 WHERE x.JENIS_DANA <> 'DAU'
 UNION ALL
 SELECT 
 x."ID",x."TAHUN_ANGGARAN",x."JENIS_BELANJA",x."SUB_JENIS_BELANJA",x."KODE_PROGRAM",x."NAMA_PROGRAM",z1."I_ID" AS "ID_SKPD", x."KODE_SKPD",x."NAMA_SKPD",x."KODE_KEGIATAN",x."NAMA_KEGIATAN",x."KODE_SUB_KEGIATAN",x."NAMA_SUB_KEGIATAN",x."KODE_RSK",x."NAMA_RSK",x."KODE_REKENING",x."NAMA_REKENING",x1.JML_ANGGARAN,x1.VOLUME_SATUAN,x1.UNIT_SATUAN,x1.JML_REALISASI,x1.VOLUME_SATUAN_REALISASI,x1.UNIT_SATUAN_REALISASI, x."JENIS_DANA",x."SUB_JENIS_DANA",x."REALISASI_BY",x."CREATED_BY",x."CREATED_AT",x."UPDATED_AT",x."JML_RENCANA_KONTRAK",x."ID_SPS", x."ALOKASI_ANGGARAN", y.NAME AS nama_jenis_belanja, z.NAME AS nama_sub_jenis_belanja, f_view_sbpk , y1.NAME AS nama_subjenis_dana, x1.DESKRIPSI AS keterangan_dau
-FROM SAMASA.belanja_realisasi x 
+FROM belanja_realisasi x 
-LEFT JOIN SAMASA.BELANJA_REALISASI_RINCI_DAU x1 ON x.ID = x1.BELANJA_REALISASI_ID 
+LEFT JOIN BELANJA_REALISASI_RINCI_DAU x1 ON x.ID = x1.BELANJA_REALISASI_ID 
-LEFT JOIN SAMASA.MST_JENIS_BELANJA y ON x.JENIS_BELANJA = y.ID 
+LEFT JOIN MST_JENIS_BELANJA y ON x.JENIS_BELANJA = y.ID 
-LEFT JOIN SAMASA.MST_JENIS_DANA y1 ON x.SUB_JENIS_DANA = y1.ID 
+LEFT JOIN MST_JENIS_DANA y1 ON x.SUB_JENIS_DANA = y1.ID 
-LEFT JOIN SAMASA.MST_SUB_JENIS_BELANJA z ON x.SUB_JENIS_BELANJA = z.ID 
+LEFT JOIN MST_SUB_JENIS_BELANJA z ON x.SUB_JENIS_BELANJA = z.ID 
 LEFT JOIN NEWSIPKD.TROPD z1 ON x.KODE_SKPD = z1.C_OPD 
 WHERE x.JENIS_DANA = 'DAU';
 
@@ -47,12 +47,12 @@ SELECT x.ID,x.TAHUN,x.SKPD_ID,x.kode_rekening,x.nama_rekening,bulan1,bulan2,bula
     NVL("4",0) AS "REAL4",NVL("5",0) AS "REAL5",NVL("6",0) AS "REAL6",
     NVL("7",0) AS "REAL7",NVL("8",0) AS "REAL8",NVL("9",0) AS "REAL9",
     NVL("10",0) AS "REAL10",NVL("11",0) AS "REAL11",NVL("12",0) AS "REAL12"   
-FROM SAMASA.AKB_PENDAPATAN x 
+FROM AKB_PENDAPATAN x 
 LEFT JOIN 
 (
     SELECT * FROM (
         SELECT TAHUN,KODE_REKENING_SPS,extract(month from RKUD_TGL) AS BULAN,RKUD_JUMLAH  
-        FROM SAMASA.PENDAPATAN_REALISASI 
+        FROM PENDAPATAN_REALISASI 
     )
     PIVOT
     (
@@ -65,8 +65,8 @@ LEFT JOIN
 CREATE VIEW VW_JENIS_BELANJA AS 
 SELECT x.ID AS ID_JENIS_BELANJA,x.NAME AS NAMA_JENIS_BELANJA,
 y.ID AS ID_SUB_JENIS_BELANJA,y.NAME AS NAMA_SUB_JENIS_BELANJA 
-FROM SAMASA.MST_JENIS_BELANJA x 
+FROM MST_JENIS_BELANJA x 
-LEFT JOIN SAMASA.MST_SUB_JENIS_BELANJA y 
+LEFT JOIN MST_SUB_JENIS_BELANJA y 
 ON x.ID = y.ID_JENIS_BELANJA 
 ORDER BY x.ID, y.ID  ;