Browse Source

20220920 fix 後台匯出功能

LuluFJ.Ho 2 years ago
parent
commit
f01e438b49

+ 1
- 1
app/Http/Controllers/Backend/DataManagement/SignupManagementController.php View File

185
             ];
185
             ];
186
         }
186
         }
187
 
187
 
188
-        SimpleExcelWriter::streamDownload('報名資料'.date('YmdHis').'.xlsx')
188
+        SimpleExcelWriter::streamDownload('報名資料'.date('Ymd').'.xlsx')
189
             ->addRows($rows)
189
             ->addRows($rows)
190
             ->toBrowser();
190
             ->toBrowser();
191
     }
191
     }

+ 12
- 12
app/Http/Services/Backend/DataManagement/SignupManagementService.php View File

32
                 ->orWhere('companyName', $keyword)
32
                 ->orWhere('companyName', $keyword)
33
                 ->orWhere('companyEmail', $keyword)
33
                 ->orWhere('companyEmail', $keyword)
34
                 ->orWhere('backupEmail', $keyword)
34
                 ->orWhere('backupEmail', $keyword)
35
-                ->orWhere('phoneNumber', $keyword)
36
-                ->orWhere('country', $keyword)
37
-                ->orWhere('trackNo', $keyword)
38
-                ->orWhere('typeOfIndustry', $keyword)
39
-                ->orWhere('typeOfJob', $keyword)
40
-                ->orWhere('jobTitle', $keyword);
35
+                ->orWhere('phoneNumber', $keyword);
36
+                // ->orWhere('country', $keyword)
37
+                // ->orWhere('trackNo', $keyword)
38
+                // ->orWhere('typeOfIndustry', $keyword)
39
+                // ->orWhere('typeOfJob', $keyword)
40
+                // ->orWhere('jobTitle', $keyword);
41
         }
41
         }
42
 
42
 
43
         $res->where('trackNo','LIKE', $trackNo.'%')
43
         $res->where('trackNo','LIKE', $trackNo.'%')
73
                 ->orWhere('companyName', $keyword)
73
                 ->orWhere('companyName', $keyword)
74
                 ->orWhere('companyEmail', $keyword)
74
                 ->orWhere('companyEmail', $keyword)
75
                 ->orWhere('backupEmail', $keyword)
75
                 ->orWhere('backupEmail', $keyword)
76
-                ->orWhere('phoneNumber', $keyword)
77
-                ->orWhere('country', $keyword)
78
-                ->orWhere('trackNo', $keyword)
79
-                ->orWhere('typeOfIndustry', $keyword)
80
-                ->orWhere('typeOfJob', $keyword)
81
-                ->orWhere('jobTitle', $keyword);
76
+                ->orWhere('phoneNumber', $keyword);
77
+                // ->orWhere('country', $keyword)
78
+                // ->orWhere('trackNo', $keyword)
79
+                // ->orWhere('typeOfIndustry', $keyword)
80
+                // ->orWhere('typeOfJob', $keyword)
81
+                // ->orWhere('jobTitle', $keyword);
82
         }
82
         }
83
         if ($trackNo) {
83
         if ($trackNo) {
84
 
84