fix claim report
This commit is contained in:
@@ -47,6 +47,46 @@ class CorporateMemberService
|
||||
{
|
||||
$limit = $request->has('perPage') ? $request->input('perPage') : 10;
|
||||
|
||||
return Member::query()
|
||||
->joinClaimRequests('right')
|
||||
->joinCorporateEmployees('left')
|
||||
->joinCorporateDivisions('left')
|
||||
->withSum('claims', 'total_claim')
|
||||
->whereHas('employeds', function (Builder $corporateEmployee) use ($corporateId) {
|
||||
$corporateEmployee->where('corporate_id', $corporateId);
|
||||
})
|
||||
->when($request->input('search'), function (Builder $query, $search) {
|
||||
$query->where(function (Builder $query) use ($search) {
|
||||
$query->orWhere('members.member_id', 'like', "%" . $search . "%")
|
||||
->orWhere('members.name', 'like', "%" . $search . "%");
|
||||
});
|
||||
})
|
||||
->when($request->input('division'), function (Builder $division, $value) {
|
||||
$division->whereHas('division', function (Builder $corporateEmployee) use ($value) {
|
||||
$corporateEmployee->where('division_id', $value);
|
||||
});
|
||||
})
|
||||
->when($request->has('orderBy'), function (Builder $query) use ($request) {
|
||||
$orderBy = match ($request->orderBy) {
|
||||
'memberId' => 'member_id',
|
||||
'fullName' => 'name',
|
||||
default => ''
|
||||
};
|
||||
|
||||
if (in_array($orderBy, ['member_id', 'name', 'active'])) {
|
||||
$query->getQuery()->orderBy($orderBy, $request->order);
|
||||
} elseif ($request->orderBy === 'division') {
|
||||
$query->getQuery()->orderBy('corporate_divisions.name', $request->order);
|
||||
}
|
||||
})
|
||||
->select(['members.id', 'members.person_id', 'members.member_id', 'members.name', 'corporate_divisions.name AS division_name', 'claim_requests.status'])
|
||||
->paginate($limit);
|
||||
}
|
||||
|
||||
public function getAllMemberClaimSubmits(int $corporateId, Request $request)
|
||||
{
|
||||
$limit = $request->has('perPage') ? $request->input('perPage') : 10;
|
||||
|
||||
return Member::query()
|
||||
->joinClaimRequests('right')
|
||||
->joinCorporateEmployees('left')
|
||||
|
||||
Reference in New Issue
Block a user