浏览代码

20220920 fix 後台匯出功能

LuluFJ.Ho 2 年前
父节点
当前提交
a21a2dcb50
共有 1 个文件被更改,包括 15 次插入8 次删除
  1. 15
    8
      app/Http/Services/Backend/DataManagement/SignupManagementService.php

+ 15
- 8
app/Http/Services/Backend/DataManagement/SignupManagementService.php 查看文件

25
         $res = $this->signupDb
25
         $res = $this->signupDb
26
             ->select('*');
26
             ->select('*');
27
             
27
             
28
-        if ($keyword){
28
+        if ($keyword) {
29
 
29
 
30
             $res = $res->where('firstName', $keyword)
30
             $res = $res->where('firstName', $keyword)
31
                 ->orWhere('lastName', $keyword)
31
                 ->orWhere('lastName', $keyword)
40
                 // ->orWhere('jobTitle', $keyword);
40
                 // ->orWhere('jobTitle', $keyword);
41
         }
41
         }
42
 
42
 
43
-        $res = $res->where('trackNo','LIKE', $trackNo.'%')
44
-            ->where('createDate', '>', $createDateStart)
45
-            ->where('createDate', '<', $createDateFinal);
43
+        if ($trackNo) {
44
+            
45
+            $res = $res->where('trackNo','LIKE', $trackNo.'%');
46
+        }
47
+        if ($createDateStart && $createDateFinal) {
48
+            
49
+            $res = $res->where('createDate', '>', $createDateStart)
50
+                ->where('createDate', '<', $createDateFinal);
51
+        }
52
+        
46
                         
53
                         
47
         // 取總筆數
54
         // 取總筆數
48
         $cnt = $res->count();
55
         $cnt = $res->count();
92
                 // ->orWhere('jobTitle', $keyword);
99
                 // ->orWhere('jobTitle', $keyword);
93
         }
100
         }
94
         
101
         
95
-        if ($createDateStart!="" && $createDateFinal!="") {
96
-            \Log::info('date123');
102
+        // if ($createDateStart!="" && $createDateFinal!="") {
103
+            // \Log::info('date123');
97
             $res = $res->where('createDate', '>', $createDateStart)
104
             $res = $res->where('createDate', '>', $createDateStart)
98
-                ->where('createDate', '<', $createDateFinal);
99
-        }
105
+                        ->where('createDate', '<', $createDateFinal);
106
+        // }
100
         
107
         
101
         $res = $this->signupDb
108
         $res = $this->signupDb
102
             ->get()
109
             ->get()