create province excel report

This commit is contained in:
2025-01-22 14:27:39 +03:30
parent 7ba7ebaa31
commit dab16915da
4 changed files with 50 additions and 48 deletions

View File

@@ -21,7 +21,7 @@ class CountryActivityPerItemReport implements FromView, WithEvents, ShouldAutoSi
public function view(): View
{
$fromDate = $this->fromDate ?? '2021-03-21';
$fromDate = $this->fromDate ?? '2021-03-21 00:00:00';
$toDate = $this->toDate ?? \Carbon\Carbon::now();
$query = "SELECT
@@ -43,7 +43,7 @@ class CountryActivityPerItemReport implements FromView, WithEvents, ShouldAutoSi
COUNT(CASE WHEN item = 16 THEN 1 END) AS EmergencyCount,
province_fa,
province_id,
COUNT(CASE WHEN item != -1 THEN 1 END) AS TotalProvinceCount
COUNT(CASE WHEN item != 20 THEN 1 END) AS TotalProvinceCount
FROM (
SELECT
province_fa,
@@ -51,7 +51,7 @@ class CountryActivityPerItemReport implements FromView, WithEvents, ShouldAutoSi
item,
status
FROM road_items_projects
WHERE activity_date_time BETWEEN '{$fromDate} 00:00:00' and '{$toDate} 23:59:59'
WHERE activity_date_time BETWEEN '{$fromDate}' and '{$toDate}'
) AS merged_table
WHERE status = 1
GROUP BY province_id, province_fa;";

View File

@@ -24,7 +24,7 @@ class ProvinceActivityPerItemReport implements FromView, WithEvents, ShouldAutoS
public function view(): View
{
$fromDate = $this->fromDate ?? '2021-03-21';
$fromDate = $this->fromDate ?? '2021-03-21 00:00:00';
$toDate = $this->toDate ?? \Carbon\Carbon::now();
$query = "SELECT
@@ -48,7 +48,7 @@ class ProvinceActivityPerItemReport implements FromView, WithEvents, ShouldAutoS
province_id,
edarat_name,
edarat_id,
COUNT(CASE WHEN item != -1 THEN 1 END) AS TotalCityCount
COUNT(CASE WHEN item != 20 THEN 1 END) AS TotalCityCount
FROM (
SELECT
province_fa,
@@ -58,11 +58,11 @@ class ProvinceActivityPerItemReport implements FromView, WithEvents, ShouldAutoS
item,
status
FROM road_items_projects
WHERE activity_date_time BETWEEN '{$fromDate} 00:00:00' and '{$toDate} 23:59:59'
WHERE activity_date_time BETWEEN '{$fromDate}' and '{$toDate}'
) AS merged_table
WHERE status = 1
AND province_id = {$this->provinceId}
GROUP BY edarat_id, edarat_name, order by province_id ASC;";
GROUP BY edarat_id, edarat_name order by province_id ASC;";
$cityActivities = collect(DB::select($query));