update
parent
e3d142746d
commit
75c56565a6
|
|
@ -88,7 +88,6 @@ class FormController implements HasMiddleware
|
|||
$inventoryYear = date('Y');
|
||||
}
|
||||
$activityForm = $this->formService->getActivityForm($sector, $code, $inventoryYear, $instansi);
|
||||
dd($inventoryYear);
|
||||
if ($instansi == 'all') {
|
||||
$activityFormId = $activityForm->pluck('id')->toArray();
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ class FormService extends SigdCrudService
|
|||
{
|
||||
$query = ActivityForm::where('sector', $sector)
|
||||
->where('form_code', $code)
|
||||
// ->where('inventory_year', $inventoryYear)
|
||||
->where('inventory_year', $inventoryYear)
|
||||
->rowActive()
|
||||
->orderBy('inventory_year', 'desc');
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue