lip 4 godzin temu
rodzic
commit
068242562d
2 zmienionych plików z 18 dodań i 2 usunięć
  1. 12 2
      app/Http/Controllers/api/NewPc.php
  2. 6 0
      app/Services/IssueService.php

+ 12 - 2
app/Http/Controllers/api/NewPc.php

@@ -227,8 +227,18 @@ class NewPc extends BaseController
         try {
             $page = request()->input('page', 1);
             $limit = request()->input('limit', 10);
-            $res['total'] = PcIssue::count();
-            $res['data'] = PcIssue::forPage($page, $limit)
+            $where = [];
+            $start_time = request()->input('start_time', '');
+            $end_time = request()->input('end_time', '');
+            $where = [];
+            if (!empty($start_time)) {
+                $where[] = ['end_time', '>=', $start_time.' 00:00:00'];
+            }
+            if (!empty($end_time)) {
+                $where[] = ['end_time', '<=', $end_time.' 23:59:59'];
+            }
+            $res['total'] = PcIssue::where($where)->count();
+            $res['data'] = PcIssue::where($where)->forPage($page, $limit)
                 ->orderByDesc('id')->get();
             foreach ($res['data'] as &$item) {
                 $item['day'] = date("m-d H:i", strtotime($item['end_time']));

+ 6 - 0
app/Services/IssueService.php

@@ -90,6 +90,12 @@ class IssueService extends BaseService
             $where[] = ['end_time', '<', date('Y-m-d H:i:s', time() - 1800)];
             $where[] = ['status', '!=', self::model()::STATUS_DRAW];
         }
+        if (!empty($search['start_time'])) {
+            $where[] = ['end_time', '>=', $search['start_time'].' 00:00:00'];
+        }
+        if (!empty($search['end_time'])) {
+            $where[] = ['end_time', '<=', $search['end_time'].' 23:59:59'];
+        }
         return $where;
     }