Update select query
This commit is contained in:
parent
13a477e883
commit
73edecf341
|
|
@ -17,6 +17,7 @@ use Illuminate\Support\Facades\Storage;
|
|||
use Modules\Admin\app\Models\Admin;
|
||||
use Modules\Admin\app\Models\MonthlyTimekeeping;
|
||||
use Modules\Admin\app\Models\Tracking;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
|
||||
class TrackingController extends Controller
|
||||
{
|
||||
|
|
@ -266,13 +267,25 @@ class TrackingController extends Controller
|
|||
->where('status', 'check in');
|
||||
|
||||
if ($startDate && $endDate) {
|
||||
$trackingData->whereBetween('created_at', [$startDate, $endDate . ' 23:59:59']);
|
||||
$trackingData->whereBetween(
|
||||
DB::raw("STR_TO_DATE(time_string, '%Y-%m-%d %H:%i:%s')"),
|
||||
[$startDate, $endDate . ' 23:59:59']
|
||||
);
|
||||
} elseif ($startDate) {
|
||||
$trackingData->where('created_at', '>=', $startDate);
|
||||
$trackingData->where(
|
||||
DB::raw("STR_TO_DATE(time_string, '%Y-%m-%d %H:%i:%s')"),
|
||||
'>=',
|
||||
$startDate
|
||||
);
|
||||
} elseif ($endDate) {
|
||||
$trackingData->where('created_at', '<=', $endDate . ' 23:59:59');
|
||||
$trackingData->where(
|
||||
DB::raw("STR_TO_DATE(time_string, '%Y-%m-%d %H:%i:%s')"),
|
||||
'<=',
|
||||
$endDate . ' 23:59:59'
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
$onTimeMorning = 0;
|
||||
$lateMorning = 0;
|
||||
$onTimeAfternoon = 0;
|
||||
|
|
|
|||
Loading…
Reference in New Issue