20220920 後台可匯出條件新增起訖日、議程地區

app/Http/Controllers/Backend/DataManagement/SignupManagementController.php

@@ -130,9 +130,9 @@ class SignupManagementController extends Controller
         }
         */
         if ($request->keyword) {
-            $datas = $this->signupManagementSv->getExportList($this->safeEncrypt(($request->keyword), 'arm'), $trackNo);
+            $datas = $this->signupManagementSv->getExportList($this->safeEncrypt(($request->keyword), 'arm'), $trackNo, $createDateStart, $createDateFinal);
         } else {
-            $datas = $this->signupManagementSv->getExportList('', $trackNo);
+            $datas = $this->signupManagementSv->getExportList('', $trackNo, $createDateStart, $createDateFinal);
         }
         
         $rows = [];

app/Http/Services/Backend/DataManagement/SignupManagementService.php

@@ -61,7 +61,7 @@ class SignupManagementService
         return $result;
     }
 
-    public function getExportList($keyword)
+    public function getExportList($keyword, $trackNo, $createDateStart, $createDateFinal)
     {
         $res = $this->signupDb
             ->select('*');
@@ -80,6 +80,11 @@ class SignupManagementService
                 ->orWhere('typeOfJob', $keyword)
                 ->orWhere('jobTitle', $keyword);
         }
+        
+        $res->where('trackNo','LIKE', $trackNo.'%')
+            ->where('createDate', '>', $createDateStart)
+            ->where('createDate', '<', $createDateFinal);
+                        
         $res = $this->signupDb
             ->get()
             ->toArray();

resources/views/admin/DataManagement/SignupManagement.blade.php

@@ -123,7 +123,7 @@
             $('#GridView1').DataTable()
                 .column(1).search($('#keyword').val())
                 .column(2).search($('#trackNo').val())
-                .column(3).search($('#createDateStart').val())trackNo
+                .column(3).search($('#createDateStart').val())
                 .column(4).search($('#createDateFinal').val())
             ;
             $('#GridView1').dataTable().fnDraw(true);