update listing

This commit is contained in:
2024-02-28 09:43:32 +07:00
parent e7d0cf2400
commit 72a97957b5
2 changed files with 15 additions and 4 deletions

View File

@@ -21,6 +21,7 @@ use Box\Spout\Writer\Common\Creator\WriterEntityFactory;
use Box\Spout\Writer\Common\Creator\Style\StyleBuilder;
use Box\Spout\Common\Entity\Style\CellAlignment;
use Box\Spout\Common\Entity\Style\Color;
use Carbon\Carbon;
class ClaimController extends Controller
{
@@ -315,8 +316,8 @@ class ClaimController extends Controller
// ->where('request_logs.status_final_log', '=', 'approved')
->where('request_logs.deleted_at', '=', null)
->when($start != 'all' && $end != 'all', function ($query) use ($start, $end) {
$query->where('request_logs.submission_date', '>=', $start)
->where('request_logs.submission_date', '<=', $end);
$query->where('request_logs.submission_date', '>=',Carbon::parse($start)->subDay())
->where('request_logs.submission_date', '<=',Carbon::parse($end)->addDay());
})
->select(
DB::raw('1 AS no'),