fix handle duplicate data

This commit is contained in:
arifal
2025-08-15 12:33:38 +07:00
parent b73183becf
commit 6896fd62a3
2 changed files with 40 additions and 26 deletions

View File

@@ -40,36 +40,50 @@ class BigdataResume extends Model
} }
public static function generateResumeData($import_datasource_id, $year, $data_setting){ public static function generateResumeData($import_datasource_id, $year, $data_setting){
// Get accurate counts without joins to avoid duplicates from multiple retributions
$verified_count = PbgTask::whereIn('status', PbgTaskStatus::getVerified())->count();
$non_verified_count = PbgTask::whereIn('status', PbgTaskStatus::getNonVerified())->count();
$waiting_click_dpmptsp_count = PbgTask::whereIn('status', PbgTaskStatus::getWaitingClickDpmptsp())->count();
$issuance_realization_pbg_count = PbgTask::whereIn('status', PbgTaskStatus::getIssuanceRealizationPbg())->count();
$process_in_technical_office_count = PbgTask::whereIn('status', PbgTaskStatus::getProcessInTechnicalOffice())->count();
$potention_count = PbgTask::whereIn('status', PbgTaskStatus::getPotention())->count();
// Business count (same logic as RequestAssignmentController)
$business_count = PbgTask::where(function ($q) {
$q->where(function ($q2) {
$q2->whereRaw("LOWER(TRIM(function_type)) LIKE ?", ['%fungsi usaha%'])
->orWhereRaw("LOWER(TRIM(function_type)) LIKE ?", ['%sebagai tempat usaha%']);
})
->whereIn("status", PbgTaskStatus::getNonVerified());
})->count();
// Non-business count (same logic as RequestAssignmentController)
$non_business_count = PbgTask::where(function ($q) {
$q->where(function ($q2) {
$q2->where(function ($q3) {
$q3->whereRaw("LOWER(TRIM(function_type)) NOT LIKE ?", ['%fungsi usaha%'])
->whereRaw("LOWER(TRIM(function_type)) NOT LIKE ?", ['%sebagai tempat usaha%']);
})
->orWhereNull('function_type');
})
->whereIn("status", PbgTaskStatus::getNonVerified());
})->count();
// Get sum values using proper aggregation to handle multiple retributions
$stats = PbgTask::leftJoin('pbg_task_retributions as ptr', 'pbg_task.uuid', '=', 'ptr.pbg_task_uid') $stats = PbgTask::leftJoin('pbg_task_retributions as ptr', 'pbg_task.uuid', '=', 'ptr.pbg_task_uid')
->selectRaw(" ->selectRaw("
COUNT(CASE WHEN pbg_task.status in (".implode(',', PbgTaskStatus::getVerified()).") THEN pbg_task.uuid END) AS verified_count,
SUM(CASE WHEN pbg_task.status in (".implode(',', PbgTaskStatus::getVerified()).") THEN ptr.nilai_retribusi_bangunan ELSE 0 END) AS verified_total, SUM(CASE WHEN pbg_task.status in (".implode(',', PbgTaskStatus::getVerified()).") THEN ptr.nilai_retribusi_bangunan ELSE 0 END) AS verified_total,
COUNT(CASE WHEN pbg_task.status in (".implode(',', PbgTaskStatus::getNonVerified()).") THEN pbg_task.uuid END) AS non_verified_count,
SUM(CASE WHEN pbg_task.status in (".implode(',', PbgTaskStatus::getNonVerified()).") THEN ptr.nilai_retribusi_bangunan ELSE 0 END) AS non_verified_total, SUM(CASE WHEN pbg_task.status in (".implode(',', PbgTaskStatus::getNonVerified()).") THEN ptr.nilai_retribusi_bangunan ELSE 0 END) AS non_verified_total,
COUNT(CASE WHEN (LOWER(TRIM(pbg_task.function_type)) LIKE '%fungsi usaha%'
OR LOWER(TRIM(pbg_task.function_type)) LIKE '%sebagai tempat usaha%')
AND pbg_task.status in (".implode(',', PbgTaskStatus::getNonVerified()).") THEN pbg_task.uuid END) AS business_count,
SUM(CASE WHEN (LOWER(TRIM(pbg_task.function_type)) LIKE '%fungsi usaha%' SUM(CASE WHEN (LOWER(TRIM(pbg_task.function_type)) LIKE '%fungsi usaha%'
OR LOWER(TRIM(pbg_task.function_type)) LIKE '%sebagai tempat usaha%') OR LOWER(TRIM(pbg_task.function_type)) LIKE '%sebagai tempat usaha%')
AND pbg_task.status in (".implode(',', PbgTaskStatus::getNonVerified()).") THEN ptr.nilai_retribusi_bangunan ELSE 0 END) AS business_total, AND pbg_task.status in (".implode(',', PbgTaskStatus::getNonVerified()).") THEN ptr.nilai_retribusi_bangunan ELSE 0 END) AS business_total,
COUNT(CASE WHEN (LOWER(TRIM(pbg_task.function_type)) NOT LIKE '%fungsi usaha%'
AND LOWER(TRIM(pbg_task.function_type)) NOT LIKE '%sebagai tempat usaha%'
AND pbg_task.status in (".implode(',', PbgTaskStatus::getNonVerified())."))
OR (pbg_task.function_type IS NULL AND pbg_task.status in (".implode(',', PbgTaskStatus::getNonVerified()).")) THEN pbg_task.uuid END) AS non_business_count,
SUM(CASE WHEN (LOWER(TRIM(pbg_task.function_type)) NOT LIKE '%fungsi usaha%' SUM(CASE WHEN (LOWER(TRIM(pbg_task.function_type)) NOT LIKE '%fungsi usaha%'
AND LOWER(TRIM(pbg_task.function_type)) NOT LIKE '%sebagai tempat usaha%' AND LOWER(TRIM(pbg_task.function_type)) NOT LIKE '%sebagai tempat usaha%'
AND pbg_task.status in (".implode(',', PbgTaskStatus::getNonVerified()).")) AND pbg_task.status in (".implode(',', PbgTaskStatus::getNonVerified())."))
OR (pbg_task.function_type IS NULL AND pbg_task.status in (".implode(',', PbgTaskStatus::getNonVerified()).")) THEN ptr.nilai_retribusi_bangunan ELSE 0 END) AS non_business_total, OR (pbg_task.function_type IS NULL AND pbg_task.status in (".implode(',', PbgTaskStatus::getNonVerified()).")) THEN ptr.nilai_retribusi_bangunan ELSE 0 END) AS non_business_total,
COUNT(CASE WHEN pbg_task.status in (".implode(',', PbgTaskStatus::getWaitingClickDpmptsp()).") THEN pbg_task.uuid END) AS waiting_click_dpmptsp_count,
SUM(CASE WHEN pbg_task.status in (".implode(',', PbgTaskStatus::getWaitingClickDpmptsp()).") THEN ptr.nilai_retribusi_bangunan ELSE 0 END) AS waiting_click_dpmptsp_total, SUM(CASE WHEN pbg_task.status in (".implode(',', PbgTaskStatus::getWaitingClickDpmptsp()).") THEN ptr.nilai_retribusi_bangunan ELSE 0 END) AS waiting_click_dpmptsp_total,
COUNT(CASE WHEN pbg_task.status in (".implode(',', PbgTaskStatus::getIssuanceRealizationPbg()).") THEN pbg_task.uuid END) AS issuance_realization_pbg_count,
SUM(CASE WHEN pbg_task.status in (".implode(',', PbgTaskStatus::getIssuanceRealizationPbg()).") THEN ptr.nilai_retribusi_bangunan ELSE 0 END) AS issuance_realization_pbg_total, SUM(CASE WHEN pbg_task.status in (".implode(',', PbgTaskStatus::getIssuanceRealizationPbg()).") THEN ptr.nilai_retribusi_bangunan ELSE 0 END) AS issuance_realization_pbg_total,
COUNT(CASE WHEN pbg_task.status in (".implode(',', PbgTaskStatus::getProcessInTechnicalOffice()).") THEN pbg_task.uuid END) AS process_in_technical_office_count,
SUM(CASE WHEN pbg_task.status in (".implode(',', PbgTaskStatus::getProcessInTechnicalOffice()).") THEN ptr.nilai_retribusi_bangunan ELSE 0 END) AS process_in_technical_office_total, SUM(CASE WHEN pbg_task.status in (".implode(',', PbgTaskStatus::getProcessInTechnicalOffice()).") THEN ptr.nilai_retribusi_bangunan ELSE 0 END) AS process_in_technical_office_total,
COUNT(CASE WHEN pbg_task.status in (".implode(',', PbgTaskStatus::getPotention()).") THEN pbg_task.uuid END) AS potention_count,
SUM(CASE WHEN pbg_task.status in (".implode(',', PbgTaskStatus::getPotention()).") THEN ptr.nilai_retribusi_bangunan ELSE 0 END) AS potention_total SUM(CASE WHEN pbg_task.status in (".implode(',', PbgTaskStatus::getPotention()).") THEN ptr.nilai_retribusi_bangunan ELSE 0 END) AS potention_total
") ")
->first(); ->first();
@@ -80,22 +94,22 @@ class BigdataResume extends Model
'import_datasource_id' => $import_datasource_id, 'import_datasource_id' => $import_datasource_id,
'spatial_count' => $service_google_sheet->getSpatialPlanningWithCalculationCount() ?? 0, 'spatial_count' => $service_google_sheet->getSpatialPlanningWithCalculationCount() ?? 0,
'spatial_sum' => $service_google_sheet->getSpatialPlanningCalculationSum() ?? 0.00, 'spatial_sum' => $service_google_sheet->getSpatialPlanningCalculationSum() ?? 0.00,
'potention_count' => ($stats->potention_count ?? 0), 'potention_count' => $potention_count,
'potention_sum' => ($stats->potention_total ?? 0), 'potention_sum' => ($stats->potention_total ?? 0),
'non_verified_count' => $stats->non_verified_count ?? 0, 'non_verified_count' => $non_verified_count,
'non_verified_sum' => $stats->non_verified_total ?? 0.00, 'non_verified_sum' => $stats->non_verified_total ?? 0.00,
'verified_count' => $stats->verified_count ?? 0, 'verified_count' => $verified_count,
'verified_sum' => $stats->verified_total ?? 0.00, 'verified_sum' => $stats->verified_total ?? 0.00,
'business_count' => $stats->business_count ?? 0, 'business_count' => $business_count,
'business_sum' => $stats->business_total ?? 0.00, 'business_sum' => $stats->business_total ?? 0.00,
'non_business_count' => $stats->non_business_count ?? 0, 'non_business_count' => $non_business_count,
'non_business_sum' => $stats->non_business_total ?? 0.00, 'non_business_sum' => $stats->non_business_total ?? 0.00,
'year' => $year, 'year' => $year,
'waiting_click_dpmptsp_count' => $stats->waiting_click_dpmptsp_count ?? 0, 'waiting_click_dpmptsp_count' => $waiting_click_dpmptsp_count,
'waiting_click_dpmptsp_sum' => $stats->waiting_click_dpmptsp_total ?? 0.00, 'waiting_click_dpmptsp_sum' => $stats->waiting_click_dpmptsp_total ?? 0.00,
'issuance_realization_pbg_count' => $stats->issuance_realization_pbg_count ?? 0, 'issuance_realization_pbg_count' => $issuance_realization_pbg_count,
'issuance_realization_pbg_sum' => $stats->issuance_realization_pbg_total ?? 0.00, 'issuance_realization_pbg_sum' => $stats->issuance_realization_pbg_total ?? 0.00,
'process_in_technical_office_count' => $stats->process_in_technical_office_count ?? 0, 'process_in_technical_office_count' => $process_in_technical_office_count,
'process_in_technical_office_sum' => $stats->process_in_technical_office_total ?? 0.00, 'process_in_technical_office_sum' => $stats->process_in_technical_office_total ?? 0.00,
]); ]);
} }

View File

@@ -14,7 +14,7 @@ services:
DB_CONNECTION: mariadb DB_CONNECTION: mariadb
DB_HOST: db DB_HOST: db
DB_PORT: 3306 DB_PORT: 3306
DB_DATABASE: sibedas_backup DB_DATABASE: siebdas_20250815
DB_USERNAME: root DB_USERNAME: root
DB_PASSWORD: root DB_PASSWORD: root
volumes: volumes:
@@ -48,7 +48,7 @@ services:
restart: unless-stopped restart: unless-stopped
environment: environment:
MYSQL_ROOT_PASSWORD: root MYSQL_ROOT_PASSWORD: root
MYSQL_DATABASE: sibedas_backup MYSQL_DATABASE: siebdas_20250815
ports: ports:
- "3306:3306" - "3306:3306"
volumes: volumes: