Browse Source

20220921 fix 後台匯出功能

LuluFJ.Ho 2 years ago
parent
commit
fec984b99b

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

50
         // 取總筆數
50
         // 取總筆數
51
         $cnt = $res->count();
51
         $cnt = $res->count();
52
         // 排序
52
         // 排序
53
-        $res = $res
54
-            ->orderByRaw((int)$orderColumn . ' ' . $orderDir);
53
+        $res = $res->orderByRaw((int)$orderColumn . ' ' . $orderDir);
55
         // 分頁
54
         // 分頁
56
-        $res = $res
57
-            ->skip($start)->take($length);
55
+        $res = $res->skip($start)->take($length);
58
         // 實際取資料
56
         // 實際取資料
59
         $result = $res
57
         $result = $res
60
             ->get()
58
             ->get()
70
         $res = $this->signupDb
68
         $res = $this->signupDb
71
             ->select('*');
69
             ->select('*');
72
             
70
             
73
-        if ($trackNo) {
74
-            $res = $res->where('trackNo','LIKE', $trackNo.'%');
75
-        }
76
-            
77
         if ($keyword) {
71
         if ($keyword) {
78
             $res->where(function($q) use ($keyword) {
72
             $res->where(function($q) use ($keyword) {
79
                 $q->where('firstName', $keyword)
73
                 $q->where('firstName', $keyword)
84
                     ->orWhere('phoneNumber', $keyword);
78
                     ->orWhere('phoneNumber', $keyword);
85
             });
79
             });
86
         }
80
         }
87
-        
81
+           
82
+        if ($trackNo) {
83
+            $res = $res->where('trackNo','LIKE', $trackNo.'%');
84
+        }
85
+         
88
         if ($createDateStart && $createDateFinal) {
86
         if ($createDateStart && $createDateFinal) {
89
             
87
             
90
             $res = $res->where('createDate', '>', $createDateStart)
88
             $res = $res->where('createDate', '>', $createDateStart)