..
This commit is contained in:
parent
ad3b9d9fdd
commit
9302368001
@ -272,11 +272,8 @@ class StaffController extends ResourceController
|
|||||||
|
|
||||||
$db = \Config\Database::connect();
|
$db = \Config\Database::connect();
|
||||||
$builder = $db->table('partner_staff_attendance a');
|
$builder = $db->table('partner_staff_attendance a');
|
||||||
$builder->select('a.staff_id , s.name AS staff_name, DATE_FORMAT(a.login_datetime, "%Y-%m") AS month, COUNT(a.id) AS login_count');
|
$builder->select('a.staff_id , s.name AS staff_name, DATE_FORMAT(a.login_datetime, "%Y-%m") AS month, COUNT(a.id) AS login_count, s.manager_id');
|
||||||
$builder->join('partner_staff s', 's.id = a.staff_id', 'left');
|
$builder->join('partner_staff s', 's.id = a.staff_id', 'left');
|
||||||
if (!empty($manager_id)) {
|
|
||||||
$builder->where('s.manager_id', $manager_id);
|
|
||||||
}
|
|
||||||
$builder->where('a.login_datetime >=', $startDateTime);
|
$builder->where('a.login_datetime >=', $startDateTime);
|
||||||
$builder->where('a.login_datetime <=', $endDateTime);
|
$builder->where('a.login_datetime <=', $endDateTime);
|
||||||
$builder->groupBy('a.staff_id');
|
$builder->groupBy('a.staff_id');
|
||||||
@ -286,6 +283,11 @@ class StaffController extends ResourceController
|
|||||||
$result = $builder->get()->getResultArray();
|
$result = $builder->get()->getResultArray();
|
||||||
|
|
||||||
foreach ($result as $key => $value) {
|
foreach ($result as $key => $value) {
|
||||||
|
// Skip (remove) rows that don't match the requested manager_id
|
||||||
|
if (!empty($manager_id) && $value['manager_id'] != $manager_id) {
|
||||||
|
unset($result[$key]);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
$result[$key]['month'] = date('M Y', strtotime($value['month']));
|
$result[$key]['month'] = date('M Y', strtotime($value['month']));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user