瀏覽代碼

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

LuluFJ.Ho 2 年之前
父節點
當前提交
05d507a52e

+ 2
- 2
app/Http/Controllers/Backend/DataManagement/SignupManagementController.php 查看文件

130
         }
130
         }
131
         */
131
         */
132
         if ($request->keyword) {
132
         if ($request->keyword) {
133
-            $datas = $this->signupManagementSv->getExportList($this->safeEncrypt(($request->keyword), 'arm'), $trackNo);
133
+            $datas = $this->signupManagementSv->getExportList($this->safeEncrypt(($request->keyword), 'arm'), $trackNo, $createDateStart, $createDateFinal);
134
         } else {
134
         } else {
135
-            $datas = $this->signupManagementSv->getExportList('', $trackNo);
135
+            $datas = $this->signupManagementSv->getExportList('', $trackNo, $createDateStart, $createDateFinal);
136
         }
136
         }
137
         
137
         
138
         $rows = [];
138
         $rows = [];

+ 6
- 1
app/Http/Services/Backend/DataManagement/SignupManagementService.php 查看文件

61
         return $result;
61
         return $result;
62
     }
62
     }
63
 
63
 
64
-    public function getExportList($keyword)
64
+    public function getExportList($keyword, $trackNo, $createDateStart, $createDateFinal)
65
     {
65
     {
66
         $res = $this->signupDb
66
         $res = $this->signupDb
67
             ->select('*');
67
             ->select('*');
80
                 ->orWhere('typeOfJob', $keyword)
80
                 ->orWhere('typeOfJob', $keyword)
81
                 ->orWhere('jobTitle', $keyword);
81
                 ->orWhere('jobTitle', $keyword);
82
         }
82
         }
83
+        
84
+        $res->where('trackNo','LIKE', $trackNo.'%')
85
+            ->where('createDate', '>', $createDateStart)
86
+            ->where('createDate', '<', $createDateFinal);
87
+                        
83
         $res = $this->signupDb
88
         $res = $this->signupDb
84
             ->get()
89
             ->get()
85
             ->toArray();
90
             ->toArray();

+ 1
- 1
resources/views/admin/DataManagement/SignupManagement.blade.php 查看文件

123
             $('#GridView1').DataTable()
123
             $('#GridView1').DataTable()
124
                 .column(1).search($('#keyword').val())
124
                 .column(1).search($('#keyword').val())
125
                 .column(2).search($('#trackNo').val())
125
                 .column(2).search($('#trackNo').val())
126
-                .column(3).search($('#createDateStart').val())trackNo
126
+                .column(3).search($('#createDateStart').val())
127
                 .column(4).search($('#createDateFinal').val())
127
                 .column(4).search($('#createDateFinal').val())
128
             ;
128
             ;
129
             $('#GridView1').dataTable().fnDraw(true);
129
             $('#GridView1').dataTable().fnDraw(true);