From b95256c23e2175f04e3d557b2fb88fa3e2177395 Mon Sep 17 00:00:00 2001
From: liyinglin <liyl@langye.net>
Date: Wed, 3 Jan 2024 17:21:52 +0800
Subject: [PATCH] 1

---
 app/Forms/ProductForm.php                              |  2 +-
 app/Http/Controllers/Admin/ProductController.php       |  6 +++---
 app/Http/Controllers/Admin/StatisticsController.php    | 10 ++++++++++
 .../2024_01_03_214637_update_product_table.php         |  2 +-
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/app/Forms/ProductForm.php b/app/Forms/ProductForm.php
index 0275ae2..44a9fbe 100755
--- a/app/Forms/ProductForm.php
+++ b/app/Forms/ProductForm.php
@@ -52,7 +52,7 @@ class ProductForm extends Form
                 'label' => false
             ]
         ]);
-        $this->add("factor_item_ids[]", Field::SELECT, ["label" => "统计价格因素", "rules" => "required", "attr" => ["multiple" => true, "data-plugin" => "select2"]]);
+        $this->add("factor_id", Field::SELECT, ["label" => "统计价格因素"]);
         $this->add('buttons', 'buttongroup', ["splitted" => true, "buttons" => [
             ["label" => "保存", "attr" => ["class" => "btn btn-primary mr-1", "type" => "submit"]],
             ["label" => "返回", "attr" => ["class" => "btn btn-light btn-back", "type" => "button"]]
diff --git a/app/Http/Controllers/Admin/ProductController.php b/app/Http/Controllers/Admin/ProductController.php
index acb6619..9f58af3 100755
--- a/app/Http/Controllers/Admin/ProductController.php
+++ b/app/Http/Controllers/Admin/ProductController.php
@@ -91,9 +91,9 @@ class ProductController extends CommonController
             "model" => $vo
         ]);
         $form->add("_previous", "hidden", ["value" => (url()->previous())]);
-        $form->modify("factor_item_ids[]", 'select', ["label" => "统计价格因素", "attr" => ["multiple" => true, "data-plugin" => "select2"],
-            "choices" => (new Factor())->where('product_id', $request->id)->get()->pluck("name", "id")->toArray()
-        ]);
+        $this->modify("factor_id", 'select', ["label" => "统计价格因素",
+            "choices" => (new Factor())->where('product_id', $request->id)->get()->pluck("name", "id")->toArray()]
+        );
         return view($this->bladePath . ".create", compact("form", "project", "vo"));
     }
 
diff --git a/app/Http/Controllers/Admin/StatisticsController.php b/app/Http/Controllers/Admin/StatisticsController.php
index f2656c1..d581f73 100755
--- a/app/Http/Controllers/Admin/StatisticsController.php
+++ b/app/Http/Controllers/Admin/StatisticsController.php
@@ -404,8 +404,18 @@ class StatisticsController extends CommonController
                 $query->whereIn('id', $areaId);
             }
         })->paginate(10);
+        foreach ($data as $item) {
+            // 获取所有床位id
+            $bedIds = Bed::where('area_id', $item->id)->pluck('id');
+            $order = Orders::whereIn('bed_id', $bedIds)->where('status', 100)->get();
+
+
+        }
+
         dd($data->toArray());
         return view($this->bladePath . ".huli", compact("data"));
     }
 
+
+
 }
diff --git a/database/migrations/2024_01_03_214637_update_product_table.php b/database/migrations/2024_01_03_214637_update_product_table.php
index 72c6a2e..475956d 100644
--- a/database/migrations/2024_01_03_214637_update_product_table.php
+++ b/database/migrations/2024_01_03_214637_update_product_table.php
@@ -14,7 +14,7 @@ class UpdateProductTable extends Migration
     public function up()
     {
         Schema::table("product", function (Blueprint $table) {
-            $table->json("factor_item_ids")->nullable();
+            $table->integer("factor_id")->nullable();
         });
     }