fix queue execute scraping syncronize simbg add new column to resume
This commit is contained in:
@@ -23,7 +23,13 @@ class BigdataResume extends Model
|
||||
'non_business_sum',
|
||||
'spatial_count',
|
||||
'spatial_sum',
|
||||
'year'
|
||||
'year',
|
||||
'waiting_click_dpmptsp_count',
|
||||
'waiting_click_dpmptsp_sum',
|
||||
'issuance_realization_pbg_count',
|
||||
'issuance_realization_pbg_sum',
|
||||
'process_in_technical_office_count',
|
||||
'process_in_technical_office_sum',
|
||||
];
|
||||
|
||||
public function importDatasource()
|
||||
@@ -31,7 +37,7 @@ class BigdataResume extends Model
|
||||
return $this->belongsTo(ImportDatasource::class, 'import_datasource_id');
|
||||
}
|
||||
|
||||
public static function generateResumeData($import_datasource_id, $year){
|
||||
public static function generateResumeData($import_datasource_id, $year, $data_setting){
|
||||
$stats = PbgTask::with(['googleSheet', 'pbg_task_retributions'])
|
||||
->leftJoin('pbg_task_retributions as ptr', 'pbg_task.uuid', '=', 'ptr.pbg_task_uid')
|
||||
->leftJoin('pbg_task_google_sheet as ptgs', 'pbg_task.registration_number', '=', 'ptgs.no_registrasi')
|
||||
@@ -82,9 +88,15 @@ class BigdataResume extends Model
|
||||
$potention_total = $query_potention->total_retribution ?? 0;
|
||||
|
||||
$query_spatial_plannings = once(function () use ($year) {
|
||||
$query = PbgTask::join('spatial_plannings as sp', 'pbg_task.document_number', '=', 'sp.number')
|
||||
->join('pbg_task_retributions as ptr', 'ptr.pbg_task_uid', '=', 'pbg_task.uuid')
|
||||
->selectRaw('COUNT(DISTINCT pbg_task.id) as task_count, SUM(ptr.nilai_retribusi_bangunan) as total_retribution');
|
||||
$query = PbgTask::leftJoin('spatial_plannings as sp', 'pbg_task.document_number', '=', 'sp.number')
|
||||
->leftJoin('pbg_task_retributions as ptr', 'ptr.pbg_task_uid', '=', 'pbg_task.uuid')
|
||||
->selectRaw('
|
||||
CASE
|
||||
WHEN COUNT(DISTINCT sp.id) > 0 THEN COUNT(DISTINCT sp.id)
|
||||
ELSE (SELECT COUNT(*) FROM spatial_plannings)
|
||||
END as task_count,
|
||||
SUM(CASE WHEN sp.id IS NOT NULL AND ptr.id IS NOT NULL THEN ptr.nilai_retribusi_bangunan ELSE 0 END) as total_retribution
|
||||
');
|
||||
|
||||
if ($year !== 'all') {
|
||||
$query->whereYear('pbg_task.task_created_at', (int) $year);
|
||||
@@ -94,7 +106,7 @@ class BigdataResume extends Model
|
||||
});
|
||||
|
||||
$spatial_planning_count = $query_spatial_plannings->task_count ?? 0;
|
||||
$spatial_planning_total = $query_spatial_plannings->total_retribution ?? 0;
|
||||
$spatial_planning_total = $query_spatial_plannings->total_retribution;
|
||||
|
||||
$potention_count -= $spatial_planning_count;
|
||||
$potention_total -= $spatial_planning_total;
|
||||
@@ -113,7 +125,13 @@ class BigdataResume extends Model
|
||||
'business_sum' => $business_total ?? 0.00,
|
||||
'non_business_count' => $non_business_count ?? 0,
|
||||
'non_business_sum' => $non_business_total ?? 0.00,
|
||||
'year' => $year
|
||||
'year' => $year,
|
||||
'waiting_click_dpmptsp_count' => $data_setting['MENUNGGU_KLIK_DPMPTSP_COUNT'] ?? 0,
|
||||
'waiting_click_dpmptsp_sum' => $data_setting['MENUNGGU_KLIK_DPMPTSP_SUM'] ?? 0.00,
|
||||
'issuance_realization_pbg_count' => $data_setting['REALISASI_TERBIT_PBG_COUNT'] ?? 0,
|
||||
'issuance_realization_pbg_sum' => $data_setting['REALISASI_TERBIT_PBG_SUM'] ?? 0.00,
|
||||
'process_in_technical_office_count' => $data_setting['PROSES_DINAS_TEKNIS_COUNT'] ?? 0,
|
||||
'process_in_technical_office_sum' => $data_setting['PROSES_DINAS_TEKNIS_SUM'] ??0.00,
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user