diff --git a/app/Services/Cartables/AccidentReceiptTableService.php b/app/Services/Cartables/AccidentReceiptTableService.php
index 4f251709..69ab80d3 100644
--- a/app/Services/Cartables/AccidentReceiptTableService.php
+++ b/app/Services/Cartables/AccidentReceiptTableService.php
@@ -46,6 +46,9 @@ class AccidentReceiptTableService
"کشوری" as province_fa,
-1 as province_id,
COUNT(id) AS tedade,
+ COUNT(CASE WHEN STATUS =0 THEN 1 END ) AS egdam,
+ COUNT(CASE WHEN STATUS IN (1,2,3,4) THEN 1 END) AS pardakht,
+ COUNT(CASE WHEN STATUS =5 THEN 1 END ) AS khatm,
COUNT(CASE WHEN report_base = 0 THEN 1 END) AS police_rah,
COUNT(CASE WHEN report_base = 1 THEN 1 END) AS gozaresh_gasht,
SUM(`sum`) AS kol_sabt_shode,
@@ -60,6 +63,9 @@ class AccidentReceiptTableService
province_fa,
province_id,
COUNT(id) AS tedade,
+ COUNT(CASE WHEN STATUS =0 THEN 1 END ) AS egdam,
+ COUNT(CASE WHEN STATUS IN (1,2,3,4) THEN 1 END) AS pardakht,
+ COUNT(CASE WHEN STATUS =5 THEN 1 END ) AS khatm,
COUNT(CASE WHEN report_base = 0 THEN 1 END) AS police_rah,
COUNT(CASE WHEN report_base = 1 THEN 1 END) AS gozaresh_gasht,
SUM(`sum`) AS kol_sabt_shode,
@@ -86,7 +92,10 @@ class AccidentReceiptTableService
'SELECT
"استانی" as city_fa,
-1 as city_id,
- COUNT(id) AS tedade,
+ COUNT(id) AS tedade,
+ COUNT(CASE WHEN STATUS =0 THEN 1 END ) AS egdam,
+ COUNT(CASE WHEN STATUS IN (1,2,3,4) THEN 1 END) AS pardakht,
+ COUNT(CASE WHEN STATUS =5 THEN 1 END ) AS khatm,
COUNT(CASE WHEN report_base = 0 THEN 1 END) AS police_rah,
COUNT(CASE WHEN report_base = 1 THEN 1 END) AS gozaresh_gasht,
SUM(`sum`) AS kol_sabt_shode,
@@ -100,7 +109,10 @@ class AccidentReceiptTableService
SELECT
city_fa,
city_id,
- COUNT(id) AS tedade,
+ COUNT(id) AS tedade,
+ COUNT(CASE WHEN STATUS =0 THEN 1 END ) AS egdam,
+ COUNT(CASE WHEN STATUS IN (1,2,3,4) THEN 1 END) AS pardakht,
+ COUNT(CASE WHEN STATUS =5 THEN 1 END ) AS khatm,
COUNT(CASE WHEN report_base = 0 THEN 1 END) AS police_rah,
COUNT(CASE WHEN report_base = 1 THEN 1 END) AS gozaresh_gasht,
SUM(`sum`) AS kol_sabt_shode,
diff --git a/resources/views/v3/Reports/AccidentReceipt/CountryReport.blade.php b/resources/views/v3/Reports/AccidentReceipt/CountryReport.blade.php
index c5745eb6..f4837f48 100644
--- a/resources/views/v3/Reports/AccidentReceipt/CountryReport.blade.php
+++ b/resources/views/v3/Reports/AccidentReceipt/CountryReport.blade.php
@@ -14,19 +14,19 @@
- |
تاریخ دریافت گزارش: {{ verta()->now()->format('Y/m/d H:i') }}
|
- |
|
- |
گزارش خسارات وارده به ابنیه فنی و تاسیسات راه از تاریخ
{{ verta($fromDate)->format('Y/n/j') }}
@@ -42,7 +42,7 @@
|
اداره کل
|
-
+ |
تعداد کل
|
@@ -59,6 +59,15 @@
|
+ |
+ در دست اقدام
+ |
+
+ در حال فرایند پرداخت
+ |
+
+ خاتمه یافته
+ |
گزارش پلیس راه
|
@@ -86,7 +95,11 @@
{{ $road['name'] }} |
- {{ $road['tedade'] }} |
+ {{ $road['egdam'] }}
+
+ {{ $road['pardakht'] }} |
+
+ {{ $road['khatm'] }} |
{{ $road['police_rah'] }} |
diff --git a/resources/views/v3/Reports/AccidentReceipt/ProvinceReport.blade.php b/resources/views/v3/Reports/AccidentReceipt/ProvinceReport.blade.php
index 501f8ce4..be9a6556 100644
--- a/resources/views/v3/Reports/AccidentReceipt/ProvinceReport.blade.php
+++ b/resources/views/v3/Reports/AccidentReceipt/ProvinceReport.blade.php
@@ -14,19 +14,19 @@
- |
تاریخ دریافت گزارش: {{ verta()->now()->format('Y/m/d H:i') }}
|
- |
|
- |
گزارش خسارات وارده به ابنیه فنی و تاسیسات راه از تاریخ
{{ verta($fromDate)->format('Y/n/j') }}
@@ -43,7 +43,7 @@
|
اداره کل
|
-
+ |
تعداد کل
|
@@ -60,6 +60,15 @@
|
+ |
+ در دست اقدام
+ |
+
+ در حال فرایند پرداخت
+ |
+
+ خاتمه یافته
+ |
گزارش پلیس راه
|
@@ -86,8 +95,12 @@
|
{{ $road['name'] }} |
+ <
+ {{ $road['egdam'] }} |
- {{ $road['tedade'] }} |
+ {{ $road['pardakht'] }}
+
+ {{ $road['khatm'] }} |
{{ $road['police_rah'] }} |
| |