arifal/sibedas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix verified

Browse Source
This commit is contained in:
arifal hidayat
2025-08-15 03:53:42 +07:00
parent 7936eb1dbf
commit 3ff3dc8f17
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/Http/Controllers/Api/RequestAssignmentController.php
View File

@@ -70,11 +70,25 @@ class RequestAssignmentController extends Controller
case 'potention': case 'potention':
$potentionStatuses = PbgTaskStatus::getPotention(); $potentionStatuses = PbgTaskStatus::getPotention();
$rejectedStatuses = PbgTaskStatus::getRejected(); $rejectedStatuses = PbgTaskStatus::getRejected();
$query->whereIn("status", $potentionStatuses) $nonVerifiedStatuses = PbgTaskStatus::getNonVerified();
->whereNotIn("status", $rejectedStatuses); $query->where(function($q) use ($potentionStatuses, $rejectedStatuses, $nonVerifiedStatuses) {
$q->where(function($q1) use ($potentionStatuses, $rejectedStatuses, $nonVerifiedStatuses) {
// Verified potention (main logic)
$q1->whereIn("status", $potentionStatuses)
->whereNotIn("status", $rejectedStatuses)
->whereNotIn("status", $nonVerifiedStatuses);
})
->orWhere(function($q2) use ($nonVerifiedStatuses) {
// Add non-verified WITH retributions (business logic exception)
$q2->whereIn("status", $nonVerifiedStatuses)
->whereHas('pbg_task_retributions');
});
});
Log::info('Potention filter applied', [ Log::info('Potention filter applied', [
'status_list' => $potentionStatuses, 'status_list' => $potentionStatuses,
'excluded_rejected' => $rejectedStatuses, 'excluded_rejected' => $rejectedStatuses,
'excluded_non_verified_without_retributions' => $nonVerifiedStatuses,
'included_non_verified_with_retributions' => true,
'count_before_filter' => PbgTask::count(), 'count_before_filter' => PbgTask::count(),
'count_after_filter' => $query->count() 'count_after_filter' => $query->count()
]); ]);

4
app/Models/BigdataResume.php
View File

@@ -69,8 +69,8 @@ class BigdataResume extends Model
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, 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, COUNT(CASE WHEN (pbg_task.status in (".implode(',', PbgTaskStatus::getPotention()).") AND pbg_task.status not in (".implode(',', PbgTaskStatus::getRejected()).") AND pbg_task.status not in (".implode(',', PbgTaskStatus::getNonVerified()).")) OR (pbg_task.status in (".implode(',', PbgTaskStatus::getNonVerified()).") AND ptr.pbg_task_uid IS NOT NULL) 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()).") AND pbg_task.status not in (".implode(',', PbgTaskStatus::getRejected()).") AND pbg_task.status not in (".implode(',', PbgTaskStatus::getNonVerified()).")) OR (pbg_task.status in (".implode(',', PbgTaskStatus::getNonVerified()).") AND ptr.pbg_task_uid IS NOT NULL) THEN ptr.nilai_retribusi_bangunan ELSE 0 END) AS potention_total
") ")
->first(); ->first();