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/Http/Controllers/Admin/MappingDbhSkpdController.php
+1 -1
View File
@@ -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
+3 -3
View File
@@ -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
LEFT JOIN SAMASA.VW_REKENING_PENDAPATAN z ON x.ID_REKENING = z.ID
FROM MAPPING_DBH_SKPD x
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
+2 -2
View File
@@ -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
LEFT JOIN SAMASA.MV_ASYNC_AKB_REALISASI y
FROM VW_BELANJA_REALISASI x
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
+11 -8
View File
@@ -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 ')
);