Merge branch 'master' of /mnt/git/v2.tiantianxinye.365care

app/Http/Controllers/Manager/OrdersController.php

@@ -133,6 +133,8 @@ class OrdersController extends CommonController
      *     @OA\Parameter(name="keyword", in="query", @OA\Schema(type="string"), required=false, description="查询关键词"),
      *     @OA\Parameter(name="building_id", in="query", @OA\Schema(type="integer"), required=false, description="楼栋ID"),
      *     @OA\Parameter(name="area_id", in="query", @OA\Schema(type="integer"), required=false, description="病区ID"),
+     *     @OA\Parameter(name="start_date_from", in="query", @OA\Schema(type="string"), required=false, description="开始服务日期区间查询的第一个值"),
+     *     @OA\Parameter(name="start_date_to", in="query", @OA\Schema(type="string"), required=false, description="开始服务日期区间查询的第二个值"),
      *     @OA\Parameter(name="days", in="query", @OA\Schema(type="integer"), required=false, description="服务天数，以实际生成的to_date和from_date比对为准，改价为0的也算"),
      *     @OA\Parameter(name="page", in="query", @OA\Schema(type="integer"), required=false, description="当前页码，默认为1"),
      *     @OA\Parameter(name="page_size", in="query", @OA\Schema(type="integer"), required=false, description="每页数量，默认为5"),
@@ -174,7 +176,11 @@ class OrdersController extends CommonController
         }
 
         if (request()->days) {
-            $model = $model->whereRaw(DB::raw("datediff(`to_date`,`from_date`) = ". (request()->days - 1)));
+            $model = $model->whereRaw(DB::raw("datediff(`to_date`,`from_date`) = " . (request()->days - 1)));
+        }
+
+        if (request()->start_date_from && request()->start_date_to) {
+            $model = $model->whereRaw(DB::raw("UNIX_TIMESTAMP(`from_date`) between " . strtotime(request()->start_date_from) . " and " . strtotime(request()->start_date_to)));
         }
 
         switch (request()->status) {