20220920 fix 後台匯出功能

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

@@ -23,37 +23,27 @@ class SignupManagementService
     {
         // 調用資料庫(或者其他業務邏輯)
         $res = $this->signupDb
-            ->select('*')
-                
-                ->where('trackNo','LIKE', $trackNo.'%');
-
-                // $res->where(function($query)
-                //     {
-                //         $query->where('createDate', '>', $createDateStart)
-                //             ->where('createDate', '<', $createDateFinal);
-                //     });
-                // $res->where(function($query)
-                //     {
-                //         $query->where('firstName', $keyword)
-                //         ->orWhere('lastName', $keyword)
-                //         ->orWhere('companyName', $keyword)
-                //         ->orWhere('companyEmail', $keyword)
-                //         ->orWhere('backupEmail', $keyword)
-                //         ->orWhere('phoneNumber', $keyword);
-                //     });
-            
+            ->select('*');
             
-            // ->where('trackNo','LIKE', $trackNo.'%')
-            // ->where('createDate', '>', $createDateStart)
-            // ->where('createDate', '<', $createDateFinal)
-                                
-            // ->where('firstName', $keyword)
-            // ->orWhere('lastName', $keyword)
-            // ->orWhere('companyName', $keyword)
-            // ->orWhere('companyEmail', $keyword)
-            // ->orWhere('backupEmail', $keyword)
-            // ->orWhere('phoneNumber', $keyword);
-    
+        if ($keyword){
+
+            $res = $res->where('firstName', $keyword)
+                ->orWhere('lastName', $keyword)
+                ->orWhere('companyName', $keyword)
+                ->orWhere('companyEmail', $keyword)
+                ->orWhere('backupEmail', $keyword)
+                ->orWhere('phoneNumber', $keyword);
+                // ->orWhere('country', $keyword)
+                // ->orWhere('trackNo', $keyword)
+                // ->orWhere('typeOfIndustry', $keyword)
+                // ->orWhere('typeOfJob', $keyword)
+                // ->orWhere('jobTitle', $keyword);
+        }
+
+        $res = $res->where('trackNo','LIKE', $trackNo.'%')
+            ->where('createDate', '>', $createDateStart)
+            ->where('createDate', '<', $createDateFinal);
+                        
         // 取總筆數
         $cnt = $res->count();
         // 排序
@@ -79,18 +69,34 @@ class SignupManagementService
         \Log::info('createDateFinal: '.$createDateFinal);
 
         $res = $this->signupDb
-            ->select('*')
+            ->select('*');
             
-            ->where('createDate', '>', $createDateStart)
-            ->where('createDate', '<', $createDateFinal)
+        if ($trackNo!="") {
+            
+            \Log::info('trackNo123');
+            $res = $res->where('trackNo','LIKE', $trackNo.'%');
+        }
+        
+        if ($keyword!=""){
+            
+            $res = $res->where('firstName', $keyword)
+                ->orWhere('lastName', $keyword)
+                ->orWhere('companyName', $keyword)
+                ->orWhere('companyEmail', $keyword)
+                ->orWhere('backupEmail', $keyword)
+                ->orWhere('phoneNumber', $keyword);
+                // ->orWhere('country', $keyword)
+                // ->orWhere('trackNo', $keyword)
+                // ->orWhere('typeOfIndustry', $keyword)
+                // ->orWhere('typeOfJob', $keyword)
+                // ->orWhere('jobTitle', $keyword);
+        }
         
-            ->where('trackNo','LIKE', $trackNo.'%')
-            ->where('firstName', $keyword)
-            ->orWhere('lastName', $keyword)
-            ->orWhere('companyName', $keyword)
-            ->orWhere('companyEmail', $keyword)
-            ->orWhere('backupEmail', $keyword)
-            ->orWhere('phoneNumber', $keyword);
+        if ($createDateStart!="" && $createDateFinal!="") {
+            \Log::info('date123');
+            $res = $res->where('createDate', '>', $createDateStart)
+                ->where('createDate', '<', $createDateFinal);
+        }
         
         $res = $this->signupDb
             ->get()