From b78f8b01e0bc12a8ccaa30a5158791b3fca31447 Mon Sep 17 00:00:00 2001
From: weizong song <sdswz@qq.com>
Date: Sat, 20 Nov 2021 10:25:12 +0800
Subject: [PATCH] up

---
 .../Controllers/Admin/OrdersController.php    | 23 ++++++++++++++++---
 resources/views/admin/orders/index.blade.php  | 20 +++++++++++++---
 2 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/Admin/OrdersController.php b/app/Http/Controllers/Admin/OrdersController.php
index 64487de..78d3d01 100755
--- a/app/Http/Controllers/Admin/OrdersController.php
+++ b/app/Http/Controllers/Admin/OrdersController.php
@@ -9,6 +9,7 @@
 namespace App\Http\Controllers\Admin;
 
 use App\Models\Orders;
+use App\Models\Project;
 use Illuminate\Http\Request;
 
 class OrdersController extends CommonController
@@ -20,6 +21,22 @@ class OrdersController extends CommonController
 
     public function index(Request $request)
     {
+        $projects = (new StatisticsController())->_checkProjects();
+        if (!$projects->count()) {
+            return $this->error($this->noProjects);
+        }
+        $project_id = request()->project_id ?? $projects->first()->id;
+        $project = Project::find($project_id);
+
+        $month = request()->month ?? date("Y-m");
+        $months = (new StatisticsController())->_getMonths();
+
+        $start_timestamp = strtotime($month);
+        $end_timestamp = strtotime("+1 month", strtotime($month));
+
+        $this->model = $this->model->whereRaw("UNIX_TIMESTAMP(`created_at`) >= " . $start_timestamp . " and UNIX_TIMESTAMP(`created_at`) < " . $end_timestamp);
+        $this->model = $this->model->where("project_id", $project_id);
+
         $data = $this->model
             ->with([
                 "orderItems",
@@ -29,8 +46,8 @@ class OrdersController extends CommonController
                 "product",
                 "customer",
                 "manager",
-                "bed" => function($query) {
-                    $query->with(["room","building"]);
+                "bed" => function ($query) {
+                    $query->with(["room", "building"]);
                 }
             ])
             ->orderBy("id", "desc")
@@ -39,6 +56,6 @@ class OrdersController extends CommonController
             $order = $order->refreshTotal();
         }
 
-        return view($this->bladePath . ".index", compact("data"));
+        return view($this->bladePath . ".index", compact("data", "project_id", "month", "project"));
     }
 }
diff --git a/resources/views/admin/orders/index.blade.php b/resources/views/admin/orders/index.blade.php
index d60fe57..15fe436 100755
--- a/resources/views/admin/orders/index.blade.php
+++ b/resources/views/admin/orders/index.blade.php
@@ -5,12 +5,26 @@
         <div class="col-12">
             <div class="card">
                 <div class="card-body">
+                    <div class="mb-3">
+                        <form class="form-inline">
+                            <select class="form-control mr-1" name="project_id"
+                                    onchange="$(this).closest('form').submit()">
+                                @foreach($projects as $pp)
+                                    <option
+                                        value="{{$pp->id}}" @if($pp->id == $project_id) {{ "selected" }}@endif>{{$pp->name}}</option>
+                                @endforeach
+                            </select>
+                            <select class="form-control" name="month" onchange="$(this).closest('form').submit()">
+                                @foreach($months as $mm)
+                                    <option value="{{$mm}}" @if($mm == $month) {{ "selected" }}@endif>{{$mm}}</option>
+                                @endforeach
+                            </select>
+                        </form>
+                    </div>
                     <table class="table table-bordered" id="data-table">
                         <thead>
                         <tr>
-                            <th>
-                                {{$modelName}}
-                            </th>
+                            <th>订单编号</th>
                             <th>所属项目/医院</th>
                             <th>客户姓名</th>
                             <th>客户余额</th>