Bugs Fix Realisasi Pendapatan dan Tambahan unit pada download realisasi belanja
This commit is contained in:
@@ -997,6 +997,8 @@ class RealisasiBelanjaController extends Controller
|
|||||||
'Unit'=>'unit_satuan_realisasi',
|
'Unit'=>'unit_satuan_realisasi',
|
||||||
'Jenis Belanja'=>'nama_jenis_belanja',
|
'Jenis Belanja'=>'nama_jenis_belanja',
|
||||||
'Sub Jenis Belanja'=>'nama_sub_jenis_belanja',
|
'Sub Jenis Belanja'=>'nama_sub_jenis_belanja',
|
||||||
|
'Semester 1'=>["semester1","satuan_sms1"],
|
||||||
|
'Semester 2'=>["semester2","satuan_sms2"],
|
||||||
];
|
];
|
||||||
|
|
||||||
foreach(GetBulan() as $key=>$namaBulan){
|
foreach(GetBulan() as $key=>$namaBulan){
|
||||||
|
|||||||
@@ -71,6 +71,7 @@ class BelanjaRealisasi extends Eloquent
|
|||||||
$sqlstr = "SELECT a.*,NVL(b.jml,0) as jml,
|
$sqlstr = "SELECT a.*,NVL(b.jml,0) as jml,
|
||||||
CASE WHEN a.jenis_dana = 'DBH' AND a.nama_subjenis_dana<>'CHT'
|
CASE WHEN a.jenis_dana = 'DBH' AND a.nama_subjenis_dana<>'CHT'
|
||||||
THEN NVL(d.jml_spd, 0) ELSE NVL(c.jml_spd, 0) END AS jml_spd,
|
THEN NVL(d.jml_spd, 0) ELSE NVL(c.jml_spd, 0) END AS jml_spd,
|
||||||
|
a2.semester1,a2.semester2,a2.satuan_sms1,a2.satuan_sms2,
|
||||||
volume_satuan_realisasi_1,volume_satuan_realisasi_2,volume_satuan_realisasi_3,volume_satuan_realisasi_4,volume_satuan_realisasi_5,volume_satuan_realisasi_6,volume_satuan_realisasi_7,
|
volume_satuan_realisasi_1,volume_satuan_realisasi_2,volume_satuan_realisasi_3,volume_satuan_realisasi_4,volume_satuan_realisasi_5,volume_satuan_realisasi_6,volume_satuan_realisasi_7,
|
||||||
volume_satuan_realisasi_8,volume_satuan_realisasi_9,volume_satuan_realisasi_10,volume_satuan_realisasi_11,volume_satuan_realisasi_12,
|
volume_satuan_realisasi_8,volume_satuan_realisasi_9,volume_satuan_realisasi_10,volume_satuan_realisasi_11,volume_satuan_realisasi_12,
|
||||||
jumlah_realisasi_1,jumlah_realisasi_2,jumlah_realisasi_3,jumlah_realisasi_4,jumlah_realisasi_5,jumlah_realisasi_6,jumlah_realisasi_7,
|
jumlah_realisasi_1,jumlah_realisasi_2,jumlah_realisasi_3,jumlah_realisasi_4,jumlah_realisasi_5,jumlah_realisasi_6,jumlah_realisasi_7,
|
||||||
@@ -78,6 +79,17 @@ class BelanjaRealisasi extends Eloquent
|
|||||||
FROM VW_BELANJA_REALISASI a
|
FROM VW_BELANJA_REALISASI a
|
||||||
LEFT JOIN BELANJA_REALISASI_RINCI a1
|
LEFT JOIN BELANJA_REALISASI_RINCI a1
|
||||||
ON a.id=a1.belanja_realisasi_id
|
ON a.id=a1.belanja_realisasi_id
|
||||||
|
LEFT JOIN (
|
||||||
|
SELECT BELANJA_REALISASI_ID,SUM(SEMESTER1) SEMESTER1,SUM(SEMESTER2) SEMESTER2,
|
||||||
|
SUM(SATUAN_SMS1) SATUAN_SMS1,SUM(SATUAN_SMS2) SATUAN_SMS2
|
||||||
|
FROM ( SELECT BELANJA_REALISASI_ID,JUMLAH_REALISASI AS SEMESTER1, 0 AS SEMESTER2,
|
||||||
|
VOLUME_SATUAN_REALISASI AS SATUAN_SMS1, 0 AS SATUAN_SMS2
|
||||||
|
FROM BELANJA_REALISASI_DETAIL WHERE SEMESTER = 1
|
||||||
|
UNION ALL SELECT BELANJA_REALISASI_ID,0 AS SEMESTER1, JUMLAH_REALISASI AS SEMESTER2,
|
||||||
|
0 AS SATUAN_SMS2, VOLUME_SATUAN_REALISASI AS SATUAN_SMS2
|
||||||
|
FROM BELANJA_REALISASI_DETAIL WHERE SEMESTER = 2
|
||||||
|
) GROUP BY BELANJA_REALISASI_ID
|
||||||
|
) a2 ON a.id = a2.BELANJA_REALISASI_ID
|
||||||
LEFT JOIN (
|
LEFT JOIN (
|
||||||
SELECT I_IDRSK,SUM(REALISASI) AS jml
|
SELECT I_IDRSK,SUM(REALISASI) AS jml
|
||||||
FROM MV_ANGGARAN_REALISASI_RSK
|
FROM MV_ANGGARAN_REALISASI_RSK
|
||||||
|
|||||||
Reference in New Issue
Block a user