RMS/backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change complaint execl

Browse Source
This commit is contained in:
amirghasempoor
2025-05-31 10:07:45 +03:30
parent 58920de857
commit 968d185292
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Exports/V2/RoadObservation/PendingComplaintsExport.php
View File

@@ -38,10 +38,10 @@ class PendingComplaintsExport implements FromView, ShouldAutoSize, WithEvents, W
return $query->where('road_observeds.province_id', $province_id);
})
->when(($fromDate && $toDate), function ($query) use ($fromDate, $toDate) {
return $query->whereBetween('road_observeds.created_at', [$fromDate, $toDate]);
return $query->whereBetween('road_observeds.StartTime_DateTime', [$fromDate, $toDate]);
})
->selectRaw('fk_RegisteredEventMessage, road_observeds.id, Title, FeatureTypeTitle, MobileForSendEventSms,
road_observeds.created_at, rms_last_activity, rms_last_activity_fa, status,
road_observeds.StartTime_DateTime, rms_last_activity, rms_last_activity_fa, status,
status_fa, supervisor_description, rms_description, province_fa, city_fa, Description, edarate_shahri.name_fa as edarate_shahri_name_fa, lat, lng')
->orderBy('status')
->orderBy('road_observeds.id', 'desc')
@@ -60,10 +60,10 @@ class PendingComplaintsExport implements FromView, ShouldAutoSize, WithEvents, W
->where('rms_status', 0)
->whereNotNull('road_observeds.province_id')
->when(($fromDate && $toDate), function ($query) use ($fromDate, $toDate) {
return $query->whereBetween('road_observeds.created_at', [$fromDate, $toDate]);
return $query->whereBetween('road_observeds.StartTime_DateTime', [$fromDate, $toDate]);
})
->selectRaw('fk_RegisteredEventMessage, road_observeds.id, Title, FeatureTypeTitle, MobileForSendEventSms,
road_observeds.created_at, rms_last_activity, rms_last_activity_fa, status,
road_observeds.StartTime_DateTime, rms_last_activity, rms_last_activity_fa, status,
status_fa, supervisor_description, rms_description, province_fa, city_fa, Description, edarate_shahri.name_fa as edarate_shahri_name_fa, lat, lng')
->orderBy('status')
->orderBy('road_observeds.id', 'desc')
@@ -81,10 +81,10 @@ class PendingComplaintsExport implements FromView, ShouldAutoSize, WithEvents, W
->where('rms_status', 0)
->whereNotNull('edarate_shahri_id')
->when(($fromDate && $toDate), function ($query) use ($fromDate, $toDate) {
return $query->whereBetween('road_observeds.created_at', [$fromDate, $toDate]);
return $query->whereBetween('road_observeds.StartTime_DateTime', [$fromDate, $toDate]);
})
->selectRaw('fk_RegisteredEventMessage, road_observeds.id, Title, FeatureTypeTitle, MobileForSendEventSms,
road_observeds.created_at, rms_last_activity, rms_last_activity_fa, status,
road_observeds.StartTime_DateTime, rms_last_activity, rms_last_activity_fa, status,
status_fa, supervisor_description, rms_description, province_fa, city_fa, Description, edarate_shahri.name_fa as edarate_shahri_name_fa, lat, lng')
->orderBy('status')
->orderBy('road_observeds.id', 'desc')