|
@@ -860,7 +860,7 @@ class TPlusServerService extends Service
|
|
|
|
|
|
// 一次性查出这些员工在最大区间范围内的所有指标
|
|
|
$results = EmployeeIndex::where('del_time', 0)
|
|
|
- ->whereIn('type', [EmployeeIndex::TYPE_ONE, EmployeeIndex::TYPE_EIGHT])
|
|
|
+ ->whereIn('type', [EmployeeIndex::TYPE_ONE, EmployeeIndex::TYPE_EIGHT, EmployeeIndex::TYPE_SIX])
|
|
|
->whereIn('employee_id', $employeeIds)
|
|
|
->where('start_time', '<=', $maxEnd)
|
|
|
->where('end_time', '>=', $minStart)
|