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

Maintenance dan bugs Fix

Browse Source
This commit is contained in:
Pusdatin BPKD Jkt
2022-07-28 11:36:37 +07:00
parent cf2a0ffdba
commit 919cd46b34
13 changed files with 396 additions and 336 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/RealisasiBelanjaController.php
+88 -49
View File
@@ -12,6 +12,7 @@ use App\Models\DbhBelanjaRealisasiDetail;
use App\Models\TempRealisasiBelanja;
use App\Models\VwAkbSpdRealRsk;
use App\Models\UnitSatuan;
use App\Models\Sp2d;
use App\Imports\RealisasiBelanjaImport;
class RealisasiBelanjaController extends Controller
@@ -49,22 +50,33 @@ class RealisasiBelanjaController extends Controller
// var_dump($DbhBelanjaRealisasi->kode_rsk,$DbhBelanjaRealisasi->kode_sub_kegiatan); exit;
$vwAKB = VwAkbSpdRealRsk::where("I_IDRSK",$DbhBelanjaRealisasi->kode_rsk)->firstorNew();
$vwSPD = DB::select(DB::raw(
'SELECT x.I_SPDNO_DOK,x.D_SPDNO,sum(y.V_SPD) AS JML
FROM NEWSIPKD.TMSPD x
LEFT JOIN NEWSIPKD.TMSPDRINCIBLJ y
ON x.I_ID = y.I_IDSPD
LEFT JOIN NEWSIPKD.TMDPASUBGIAT z
ON y.I_IDSUBGIAT = z.I_ID
LEFT JOIN NEWSIPKD.TROPD a
ON x.I_IDOPD = a.I_ID
WHERE z.C_SUBGIAT = \''.$DbhBelanjaRealisasi->kode_sub_kegiatan.'\'
AND a.C_OPD = \''.$DbhBelanjaRealisasi->kode_skpd.'\'
AND x.C_ANGG_TAHUN = \''.$DbhBelanjaRealisasi->tahun_anggaran.'\'
GROUP BY x.I_SPDNO_DOK,x.D_SPDNO
ORDER BY x.D_SPDNO '
));
//var_dump($vwSPD); exit;
return view('realisasi_belanja.submit', compact("DbhBelanjaRealisasi","vwAKB","vwSPD"));
'SELECT x.I_SPDNO_DOK,x.D_SPDNO,sum(y.V_SPD) AS JML
FROM NEWSIPKD.TMSPD x
LEFT JOIN NEWSIPKD.TMSPDRINCIBLJ y
ON x.I_ID = y.I_IDSPD
LEFT JOIN NEWSIPKD.TMDPASUBGIAT z
ON y.I_IDSUBGIAT = z.I_ID
LEFT JOIN NEWSIPKD.TROPD a
ON x.I_IDOPD = a.I_ID
WHERE z.C_SUBGIAT = \''.$DbhBelanjaRealisasi->kode_sub_kegiatan.'\'
AND a.C_OPD = \''.$DbhBelanjaRealisasi->kode_skpd.'\'
AND x.C_ANGG_TAHUN = \''.$DbhBelanjaRealisasi->tahun_anggaran.'\'
GROUP BY x.I_SPDNO_DOK,x.D_SPDNO
ORDER BY x.D_SPDNO '
));
$vwSP2D = DB::select(DB::raw('SELECT x.I_ID as IDSP2D, x.I_IDOPD,x.I_SP2DNO_DOK,
TO_CHAR(x.D_SP2D_SAH,\'DD-MM-YYYY\') AS D_SP2D_SAH,x.V_SPP
FROM NEWSIPKD.TMSP2D x
LEFT JOIN NEWSIPKD.TMSPPRINCIBLJRSK y
ON x.I_IDSPP = y.I_IDSPP
WHERE y.I_IDRSK='.$DbhBelanjaRealisasi->kode_rsk.' ORDER BY x.D_SP2D_SAH ' )
);
// foreach($vwSP2D as $key=>$sp2d){
// var_dump($sp2d->i_sp2dno_dok);
// }
// exit;
return view('realisasi_belanja.submit', compact("DbhBelanjaRealisasi","vwAKB","vwSPD","vwSP2D"));
}
public function datatable(Request $request)
@@ -75,13 +87,14 @@ class RealisasiBelanjaController extends Controller
$src = isset($post["search"])?$post["search"]["value"]:"";
$dataFilter=0;
$data = DB::select(DB::raw('SELECT * FROM DBH_BELANJA_REALISASI x
$data = DB::select(DB::raw('SELECT x.*,y.JML_REALISASI_SP2D FROM DBH_BELANJA_REALISASI x
LEFT JOIN (
SELECT DBH_BELANJA_REALISASI_ID,SUM(JUMLAH_REALISASI) AS jml_realisasi,
sum(VOLUME_SATUAN_REALISASI) AS vol_realisasi, unit_satuan_realisasi
FROM SAMASA.DBH_BELANJA_REALISASI_DETAIL
GROUP BY DBH_BELANJA_REALISASI_ID,UNIT_SATUAN_REALISASI
) y ON x.ID = y.DBH_BELANJA_REALISASI_ID'));
SELECT I_IDRSK,SUM(y.V_SPP) AS JML_REALISASI_SP2D
FROM NEWSIPKD.TMSP2D x
LEFT JOIN NEWSIPKD.TMSPPRINCIBLJRSK y
ON x.I_IDSPP = y.I_IDSPP
GROUP BY I_IDRSK
) y ON x.KODE_RSK = y.I_IDRSK'));
if (!empty($src)){
$data->whereRaw("(LOWER(jenis_belanja) LIKE '%".strtolower($src)."%'
@@ -243,29 +256,67 @@ class RealisasiBelanjaController extends Controller
return view('realisasi_belanja.upload');
}
// public function inputRealisasi(Request $request, $id)
// {
// $DbhBelanjaRealisasi = DbhBelanjaRealisasi::where("id", $id)->firstOrNew();
// $req = $request->all();
// $redirect = isset($req["redirect_link"])?$req["redirect_link"]:"/dbh/realisasi-belanja";
// if ($request->isMethod('post')) {
// try{
// DB::beginTransaction();
// $DbhBelanjaRealisasiDetail = DbhBelanjaRealisasiDetail::where(["dbh_belanja_realisasi_id"=>$id,"no_sp2d"=>$req["no_sp2d"]]);
// $data["dbh_belanja_realisasi_id"] = $id;
// $data["volume_satuan_realisasi"] = $req["vol_realisasi"];
// $data["unit_satuan_realisasi"] = $req["unit_realisasi"];
// $data["jumlah_realisasi"] = replaceMoney($req["jml_realisasi"]);
// $data["no_sp2d"] = $req["no_sp2d"];
// $data["created_by"] = Auth::user()->id;
// // var_dump($DbhBelanjaRealisasiDetail->count()); exit;
// if ($DbhBelanjaRealisasiDetail->count()==0){
// DbhBelanjaRealisasiDetail::create($data);
// }else{
// $DbhBelanjaRealisasiDetail->firstorNew()->update($data);
// }
// DB::commit();
// return redirect($redirect)->with('success','Data Realisasi berhasil di input!');
// }catch(\Exception $e){
// throw new \Exception($e->getMessage());
// DB::rollBack();
// return redirect($redirect)->with('error',$e->getMessage());
// }
// }
// $DbhBelanjaRealisasiDetail = DB::select(
// DB::raw('SELECT x.I_ID as IDSP2D, x.I_IDOPD,x.I_SP2DNO_DOK,TO_CHAR(x.D_SP2D_SAH,\'DD-MM-YYYY\') AS D_SP2D_SAH,x.V_SPP,
// a.no_sp2d,a.jumlah_realisasi,a.VOLUME_SATUAN_REALISASI,a.UNIT_SATUAN_REALISASI,a.ID
// FROM NEWSIPKD.TMSP2D x
// LEFT JOIN NEWSIPKD.TMSPPRINCIBLJRSK y
// ON x.I_IDSPP = y.I_IDSPP
// LEFT JOIN SAMASA.DBH_BELANJA_REALISASI_DETAIL a
// ON x.I_SP2DNO_DOK = a.NO_SP2D
// WHERE x.I_ID='.$request->id_sp2d.' ORDER BY x.D_SP2D_SAH ' )
// );
// $DbhBelanjaRealisasiDetail = $DbhBelanjaRealisasiDetail == null ? null : $DbhBelanjaRealisasiDetail[0];
// $unitSatuan = UnitSatuan::orderBy("id")->get();
// return view('realisasi_belanja.form_input_realisasi',compact("DbhBelanjaRealisasi", "DbhBelanjaRealisasiDetail", "unitSatuan","redirect"));
// }
public function inputRealisasi(Request $request, $id)
{
$DbhBelanjaRealisasi = DbhBelanjaRealisasi::where("id", $id)->firstOrNew();
$req = $request->all();
$redirect = isset($req["redirect_link"])?$req["redirect_link"]:"/dbh/realisasi-belanja";
$redirect = isset($req["redirect_link"])?$req["redirect_link"]:"realisasi-belanja";
if ($request->isMethod('post')) {
try{
DB::beginTransaction();
$DbhBelanjaRealisasiDetail = DbhBelanjaRealisasiDetail::where(["dbh_belanja_realisasi_id"=>$id,"no_sp2d"=>$req["no_sp2d"]]);
$data["dbh_belanja_realisasi_id"] = $id;
$data["volume_satuan_realisasi"] = $req["vol_realisasi"];
$data["unit_satuan_realisasi"] = $req["unit_realisasi"];
$data["jumlah_realisasi"] = replaceMoney($req["jml_realisasi"]);
$data["no_sp2d"] = $req["no_sp2d"];
$data["created_by"] = Auth::user()->id;
// var_dump($DbhBelanjaRealisasiDetail->count()); exit;
if ($DbhBelanjaRealisasiDetail->count()==0){
DbhBelanjaRealisasiDetail::create($data);
}else{
$DbhBelanjaRealisasiDetail->firstorNew()->update($data);
}
$data["realisasi_by"] = Auth::user()->id;
$DbhBelanjaRealisasi->update($data);
DB::commit();
return redirect($redirect)->with('success','Data Realisasi berhasil di input!');
@@ -276,20 +327,8 @@ class RealisasiBelanjaController extends Controller
}
}
$DbhBelanjaRealisasiDetail = DB::select(
DB::raw('SELECT x.I_ID as IDSP2D, x.I_IDOPD,x.I_SP2DNO_DOK,TO_CHAR(x.D_SP2D_SAH,\'DD-MM-YYYY\') AS D_SP2D_SAH,x.V_SPP,
a.no_sp2d,a.jumlah_realisasi,a.VOLUME_SATUAN_REALISASI,a.UNIT_SATUAN_REALISASI,a.ID
FROM NEWSIPKD.TMSP2D x
LEFT JOIN NEWSIPKD.TMSPPRINCIBLJRSK y
ON x.I_IDSPP = y.I_IDSPP
LEFT JOIN SAMASA.DBH_BELANJA_REALISASI_DETAIL a
ON x.I_SP2DNO_DOK = a.NO_SP2D
WHERE x.I_ID='.$request->id_sp2d.' ORDER BY x.D_SP2D_SAH ' )
);
$DbhBelanjaRealisasiDetail = $DbhBelanjaRealisasiDetail == null ? null : $DbhBelanjaRealisasiDetail[0];
$unitSatuan = UnitSatuan::orderBy("id")->get();
return view('realisasi_belanja.form_input_realisasi',compact("DbhBelanjaRealisasi", "DbhBelanjaRealisasiDetail", "unitSatuan","redirect"));
return view('realisasi_belanja.form_input_realisasi',compact("DbhBelanjaRealisasi", "unitSatuan","redirect"));
}
public function datatableInputRealisasi(Request $request)
app/Http/Controllers/RealisasiPendapatanController.php
+23 -20
View File
@@ -33,6 +33,23 @@ class RealisasiPendapatanController extends Controller
return view('realisasi_pendapatan.create');
}
protected function dataPendapatan($req= [])
{
$data["tahun"] = $req["txt_ta"];
$data["id_sps"] = $req["txt_id_sps"];
$txt_rek_sps = explode("|",$req["txt_rek_sps"]);
$data["kode_rekening_sps"] = $txt_rek_sps[0];
$data["nama_rekening_sps"] = $txt_rek_sps[1];
$data["simtrad4_uraian"] = $req["txt_simtrad4_uraian"];
$data["simtrad4_kotor"] = replaceMoney($req["txt_simtrad4_kotor"]);
$data["simtrad4_potongan"] = replaceMoney($req["txt_simtrad4_potongan"]);
$data["simtrad4_bersih"] = replaceMoney($req["txt_simtrad4_bersih"]);
$data["simtrad4_tgl_sp2d_bun"] = ConvertIndoDate($req["txt_simtrad4_tgl_sp2d_bun"]);
$data["simtrad4_sp2d_bun"] = $req["txt_simtrad4_sp2d_bun"];
return $data;
}
public function store(Request $request)
{
try{
@@ -40,16 +57,7 @@ class RealisasiPendapatanController extends Controller
DB::beginTransaction();
$req = $request->all();
$data["tahun"] = $req["txt_ta"];
$data["id_sps"] = $req["txt_id_sps"];
$txt_rek_sps = explode("|",$req["txt_rek_sps"]);
$data["kode_rekening_sps"] = $txt_rek_sps[0];
$data["nama_rekening_sps"] = $txt_rek_sps[1];
$data["simtrad4_uraian"] = $req["txt_simtrad4_uraian"];
$data["simtrad4_kotor"] = replaceMoney($req["txt_simtrad4_kotor"]);
$data["simtrad4_potongan"] = replaceMoney($req["txt_simtrad4_potongan"]);
$data["simtrad4_bersih"] = replaceMoney($req["txt_simtrad4_bersih"]);
$data["simtrad4_sp2d_bun"] = $req["txt_simtrad4_sp2d_bun"];
$data = $this->dataPendapatan($req);
$data["created_by"] = Auth::user()->id;
$DbhPendapatanRealisasi = DbhPendapatanRealisasi::create($data);
@@ -84,16 +92,7 @@ class RealisasiPendapatanController extends Controller
DB::beginTransaction();
$req = $request->all();
$data["tahun"] = $req["txt_ta"];
$data["id_sps"] = $req["txt_id_sps"];
$txt_rek_sps = explode("|",$req["txt_rek_sps"]);
$data["kode_rekening_sps"] = $txt_rek_sps[0];
$data["nama_rekening_sps"] = $txt_rek_sps[1];
$data["simtrad4_uraian"] = $req["txt_simtrad4_uraian"];
$data["simtrad4_kotor"] = replaceMoney($req["txt_simtrad4_kotor"]);
$data["simtrad4_potongan"] = replaceMoney($req["txt_simtrad4_potongan"]);
$data["simtrad4_bersih"] = replaceMoney($req["txt_simtrad4_bersih"]);
$data["simtrad4_sp2d_bun"] = $req["txt_simtrad4_sp2d_bun"];
$data = $this->dataPendapatan($req);
$data["updated_by"] = Auth::user()->id;
$realisasi_pendapatan->update($data);
@@ -184,6 +183,10 @@ class RealisasiPendapatanController extends Controller
DB::beginTransaction();
$data = DbhPendapatanRealisasi::firstOrNew(array('id' => $realisasiId));
if ($data["simtrad4_bersih"]<>replaceMoney($req["rkud_jumlah"])){
return redirect(url("/dbh/realisasi-pendapatan/".$realisasiId))->with('error', "Jumlah STS harus sama dengan Rencana !");
}
$data["rkud_tgl"] = $req["rkud_tgl"];
$data["rkud_no_sts"] = $req["rkud_no_sts"];
$data["rkud_kode_akun"] = $req["rkud_kode_akun"];
app/Models/DbhPendapatanRealisasi.php
+1 -1
View File
@@ -13,7 +13,7 @@ class DbhPendapatanRealisasi extends Eloquent
protected $connection = 'Samasa';
protected $table = 'SAMASA.dbh_pendapatan_realisasi';
protected $fillable = [
'tahun','simtrad4_uraian','simtrad4_kotor','simtrad4_potongan','simtrad4_bersih','simtrad4_sp2d_bun',
'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'
];