gitea/sidata
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Merge branch 'dev'

Browse Source
This commit is contained in:
izuddin
2025-03-21 08:55:35 +07:00
parent 5ea516a594 66b6dc24f9
commit 04aa047643
30 changed files with 63 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Models/AkbPendapatan.php
+1 -1
View File
@@ -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
+3 -3
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+3 -3
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -11,6 +11,6 @@ class VwRekeningPendapatan extends Eloquent
{
use HasFactory;
protected $connection = 'oracle';
protected $table = 'SAMASA.VW_REKENING_PENDAPATAN';
protected $table = 'VW_REKENING_PENDAPATAN';
}