查询时间不能超过当前时间

app/Http/Controllers/ControlPanelController.php

@@ -24,12 +24,6 @@ class ControlPanelController extends Controller
 
     public function index()
     {
-        /**
-         * @var CheckActiveMenuService $checkActiveMenuService
-         * @var RealtimePendingOrdersService $realtimePendingOrdersService
-         * @var OrderCountingRecordService $orderCountingRecords
-         * @var LaborReportsCountingRecordService $laborReportsCountingRecordService
-         */
         $checkActiveMenuService = app(CheckActiveMenuService::class);
         $menus = $checkActiveMenuService->activeMenus();
         $realtimePendingOrdersService = app(RealtimePendingOrdersService::class);
@@ -45,24 +39,23 @@ class ControlPanelController extends Controller
         $laborReportsCountingRecordService = app(LaborReportsCountingRecordService::class);
         $laborReportsCountingRecords = $laborReportsCountingRecordService->get($start, $end, '日');
         $laborReportsUserGroupsCount = $laborReportsCountingRecordService->userGroupsCount($start, $end);
-        return view('control.panel', compact('menus', 'warehousesOrders', 'orderCountingRecords', 'logisticsCountingRecords', 'warehouseCountingRecords', 'laborReportsCountingRecords','laborReportsUserGroupsCount'));
+        return view('control.panel', compact('menus', 'warehousesOrders', 'orderCountingRecords', 'logisticsCountingRecords', 'warehouseCountingRecords', 'laborReportsCountingRecords', 'laborReportsUserGroupsCount'));
     }
 
     public function orderCountingRecordsApi(Request $request)
     {
         $orderCountingRecordService = app(OrderCountingRecordService::class);
-        $start = $request->start;
-        $end = $request->end;
-        $unit = $request->unit;
-        $orderCountingRecords = $orderCountingRecordService->orderCountingRecords($start, $end, null, $unit, null);
+        $start = Carbon::parse($request->start)->gt(Carbon::now()) ? Carbon::now()->toDateString() : $request->start;
+        $end = Carbon::parse($request->end)->gt(Carbon::now()) ? Carbon::now()->toDateString() : $request->end;
+        $orderCountingRecords = $orderCountingRecordService->orderCountingRecords($start, $end, null, $request->unit, null);
         return compact('orderCountingRecords');
     }
 
     public function logisticsCountingRecordsApi(Request $request)
     {
         $orderCountingRecordService = app(OrderCountingRecordService::class);
-        $start = $request->start;
-        $end = $request->end;
+        $start = Carbon::parse($request->start)->gt(Carbon::now()) ? Carbon::now()->toDateString() : $request->start;
+        $end = Carbon::parse($request->end)->gt(Carbon::now()) ? Carbon::now()->toDateString() : $request->end;
         $logisticsCountingRecords = $orderCountingRecordService->logisticsCountingRecords($start, $end);
         return compact('logisticsCountingRecords');
     }
@@ -70,8 +63,8 @@ class ControlPanelController extends Controller
     public function warehouseCountingRecordsApi(Request $request)
     {
         $orderCountingRecordService = app(OrderCountingRecordService::class);
-        $start = $request->start;
-        $end = $request->end;
+        $start = Carbon::parse($request->start)->gt(Carbon::now()) ? Carbon::now()->toDateString() : $request->start;
+        $end = Carbon::parse($request->end)->gt(Carbon::now()) ? Carbon::now()->toDateString() : $request->end;
         $warehouseCountingRecords = $orderCountingRecordService->warehouseCountingRecords($start, $end);
         return compact('warehouseCountingRecords');
     }
@@ -79,8 +72,8 @@ class ControlPanelController extends Controller
     public function laborReportsCountingRecordApi(Request $request)
     {
         $laborReportsCountingRecordService = app(LaborReportsCountingRecordService::class);
-        $start = $request->start;
-        $end = $request->end;
+        $start = Carbon::parse($request->start)->gt(Carbon::now()) ? Carbon::now()->toDateString() : $request->start;
+        $end = Carbon::parse($request->end)->gt(Carbon::now()) ? Carbon::now()->toDateString() : $request->end;
         $unit = $request->unit;
         $laborReportsCountingRecords = $laborReportsCountingRecordService->get($start, $end, $unit);
         return compact('laborReportsCountingRecords');
@@ -89,8 +82,8 @@ class ControlPanelController extends Controller
     public function laborReportsUserGroupsCountApi(Request $request)
     {
         $laborReportsCountingRecordService = app(LaborReportsCountingRecordService::class);
-        $start = $request->start;
-        $end = $request->end;
+        $start = Carbon::parse($request->start)->gt(Carbon::now()) ? Carbon::now()->toDateString() : $request->start;
+        $end = Carbon::parse($request->end)->gt(Carbon::now()) ? Carbon::now()->toDateString() : $request->end;
         $laborReportsUserGroupsCount = $laborReportsCountingRecordService->userGroupsCount($start, $end);
         return compact('laborReportsUserGroupsCount');
     }

app/Services/OrderCountingRecordService.php

@@ -267,7 +267,7 @@ class OrderCountingRecordService
         });
         if ($isHasCurrentDate) {
             //删除OrderCountingRecord表中与当前日期相关的数据，之后的批量插入重新插入这部分数据
-            OrderCountingRecord::query()->where('date_target', $currentDate)->where('counting_unit', $unit)->delete();
+//            OrderCountingRecord::query()->where('date_target', $currentDate)->where('counting_unit', $unit)->delete();
         }
         OrderCountingRecord::query()->insert($result->toArray());
         return ['resultOrders' => $result];

tests/Services/OrderCountingRecordService/DateTestTest.php

@@ -20,4 +20,16 @@ class DateTestTest extends TestCase
         $this->assertTrue('2020-48' == Carbon::now()->year . '-' . Carbon::now()->week);
         $this->assertTrue('2020-11' == Carbon::now()->year . '-' . Carbon::now()->month);
     }
+
+    /**
+     * @test
+     */
+    public function compare_date()
+    {
+        $dateStr = '2020-12-30';
+
+        $end = Carbon::parse($dateStr)->gt(Carbon::now()) ? Carbon::now()->toDateString() : $dateStr;
+
+        dd($end);
+    }
 }