api workflow.logs

main
panliang 2024-04-27 09:48:17 +08:00
parent 6c2ad0485c
commit e5fe4b2054
4 changed files with 4 additions and 2 deletions

View File

@ -39,6 +39,7 @@ class EmployeeController extends AdminController
->filterDefaultVisible() ->filterDefaultVisible()
->columns([ ->columns([
amisMake()->TableColumn()->name('store.title')->label(__('employee.store_id')), amisMake()->TableColumn()->name('store.title')->label(__('employee.store_id')),
amisMake()->TableColumn()->name('admin_user.username')->label(__('admin.username')),
amisMake()->TableColumn()->name('name')->label(__('employee.name')), amisMake()->TableColumn()->name('name')->label(__('employee.name')),
amisMake()->TableColumn()->name('avatar')->label(__('employee.avatar'))->type('avatar')->src('${avatar}'), amisMake()->TableColumn()->name('avatar')->label(__('employee.avatar'))->type('avatar')->src('${avatar}'),
amisMake()->TableColumn()->name('jobs')->label(__('employee.jobs'))->type('each')->items(amisMake()->Tag()->label('${name}')), amisMake()->TableColumn()->name('jobs')->label(__('employee.jobs'))->type('each')->items(amisMake()->Tag()->label('${name}')),

View File

@ -8,7 +8,7 @@ use Illuminate\Support\Facades\Validator;
class StoreEmployeeService extends BaseService class StoreEmployeeService extends BaseService
{ {
protected array $withRelationships = ['store', 'jobs']; protected array $withRelationships = ['store', 'jobs', 'adminUser'];
protected string $modelName = Employee::class; protected string $modelName = Employee::class;

View File

@ -120,7 +120,7 @@ class WorkflowController extends Controller
} else { } else {
$check = WorkflowCheck::where('subject_type', $subjectType)->where('subject_id', $id)->firstOrFail(); $check = WorkflowCheck::where('subject_type', $subjectType)->where('subject_id', $id)->firstOrFail();
} }
$logs = $check->logs()->sort()->get(); $logs = $check->logs()->with(['checkUser'])->sort()->get();
return WorkflowLogResource::collection($logs); return WorkflowLogResource::collection($logs);
} }

View File

@ -29,6 +29,7 @@ class WorkflowLogResource extends JsonResource
'check_status_text' => $this->check_status->text(), 'check_status_text' => $this->check_status->text(),
'sort' => $this->sort, 'sort' => $this->sort,
'check' => WorkflowCheckResource::make($this->whenLoaded('check')), 'check' => WorkflowCheckResource::make($this->whenLoaded('check')),
'check_user' => EmployeeResource::make($this->whenLoaded('checkUser')),
]; ];
} }
} }