From c8bcd0e8f0faa8e850dacf048f73d8a7448d2e90 Mon Sep 17 00:00:00 2001
From: liyinglin <liyl@langye.net>
Date: Fri, 27 Oct 2023 14:17:38 +0800
Subject: [PATCH] 1

---
 .../Controllers/Admin/AsksubmitController.php | 79 -------------------
 .../Controllers/Admin/ProjectController.php   | 27 +++++++
 .../asksubmit_create.blade.php}               |  0
 .../asksubmit_index.blade.php}                |  2 +-
 resources/views/admin/project/index.blade.php |  2 +-
 routes/web.php                                |  5 +-
 6 files changed, 30 insertions(+), 85 deletions(-)
 delete mode 100755 app/Http/Controllers/Admin/AsksubmitController.php
 rename resources/views/admin/{asksubmit/create.blade.php => project/asksubmit_create.blade.php} (100%)
 rename resources/views/admin/{asksubmit/index.blade.php => project/asksubmit_index.blade.php} (98%)

diff --git a/app/Http/Controllers/Admin/AsksubmitController.php b/app/Http/Controllers/Admin/AsksubmitController.php
deleted file mode 100755
index dacfdda..0000000
--- a/app/Http/Controllers/Admin/AsksubmitController.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: weizongsong
- * Date: 2019-04-12
- * Time: 22:34
- */
-
-namespace App\Http\Controllers\Admin;
-
-use App\Admin;
-use App\Events\ProjectSaved;
-use App\Exports\CommonExport;
-use App\Forms\AskSubmitForm;
-use App\Forms\ProjectForm;
-use App\Models\AdminAreaLink;
-use App\Models\Area;
-use App\Models\AskSubmit;
-use App\Models\Bed;
-use App\Models\Building;
-use App\Models\ParamedicLevel;
-use App\Models\Project;
-use App\Models\Room;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
-use Kris\LaravelFormBuilder\FormBuilder;
-use Maatwebsite\Excel\Facades\Excel;
-use Spatie\Permission\Models\Role;
-
-class AskSubmitController extends CommonController
-{
-    public $bladePath = "admin.project";
-    public $urlPrefix = "admin/project";
-    public $modelName = "满意度调查";
-    public $modelClass = AskSubmit::class;
-    public $formClass = AskSubmitForm::class;
-
-    public function index(Request $request)
-    {
-        $userId = auth()->id();
-        // 判断是否护士长
-        $roleId = Role::where('name', 'like', '%护士长%')->where('guard_name', 'admin')->value('id');
-        $hushizhang = DB::table('model_has_roles')->where('role_id', $roleId)
-            ->where('model_type', 'App\Admin')
-            ->where('model_id', $userId)->count();
-
-        $data = AskSubmit::with("admin", "project")
-            ->where(function ($qeury) use ($hushizhang, $userId) {
-                if ($hushizhang) {
-                    $qeury->where('admin_id', $userId);
-                }
-            })->paginate(10);
-        return view($this->bladePath . ".index", compact("data"));
-    }
-
-
-    public function edit($id = null, Request $request, FormBuilder $formBuilder)
-    {
-        $vo = (new Project())->with("paramedicLevels")->find($id ?: $request->id);
-
-        $form = $formBuilder->create($this->formClass, [
-            "method" => "POST",
-            "id" => "fm",
-            "url" => url($this->urlPrefix . "/update/" . $vo->id),
-            "class" => "form form-horizontal validate-form",
-            "model" => $vo
-        ]);
-        $form->add("_previous", "hidden", ["value" => (url()->previous())]);
-
-        return view($this->bladePath . ".create", compact("form"));
-    }
-
-    public function updated($model)
-    {
-        event(new ProjectSaved($model));
-    }
-
-
-}
diff --git a/app/Http/Controllers/Admin/ProjectController.php b/app/Http/Controllers/Admin/ProjectController.php
index 1ada7cc..0574956 100755
--- a/app/Http/Controllers/Admin/ProjectController.php
+++ b/app/Http/Controllers/Admin/ProjectController.php
@@ -280,4 +280,31 @@ class ProjectController extends CommonController
 
         return Excel::download(new CommonExport($data), "beds.xlsx");
     }
+
+    /**
+     * 满意度调查
+     */
+    public function askSubmit()
+    {
+        $userId = auth()->id();
+        // 判断是否护士长
+        $roleId = Role::where('name', 'like', '%护士长%')->where('guard_name', 'admin')->value('id');
+        $hushizhang = DB::table('model_has_roles')->where('role_id', $roleId)
+            ->where('model_type', 'App\Admin')
+            ->where('model_id', $userId)->count();
+
+        $data = AskSubmit::with("admin", "project")
+            ->where(function ($qeury) use ($hushizhang, $userId) {
+                if ($hushizhang) {
+                    $qeury->where('admin_id', $userId);
+                }
+            })->paginate(10);
+        return view($this->bladePath . ".ask_submit", compact("data"));
+    }
+
+    public function askSubmitCreate(){
+        return view($this->bladePath . ".ask_submit_create", compact("data"));
+    }
+
+
 }
diff --git a/resources/views/admin/asksubmit/create.blade.php b/resources/views/admin/project/asksubmit_create.blade.php
similarity index 100%
rename from resources/views/admin/asksubmit/create.blade.php
rename to resources/views/admin/project/asksubmit_create.blade.php
diff --git a/resources/views/admin/asksubmit/index.blade.php b/resources/views/admin/project/asksubmit_index.blade.php
similarity index 98%
rename from resources/views/admin/asksubmit/index.blade.php
rename to resources/views/admin/project/asksubmit_index.blade.php
index ad35f4f..3700182 100755
--- a/resources/views/admin/asksubmit/index.blade.php
+++ b/resources/views/admin/project/asksubmit_index.blade.php
@@ -7,7 +7,7 @@
                 <div class="card-body">
                     <div class="mb-3">
                         <a class="btn btn-primary" href="{{url($urlPrefix.'/create')}}">
-                            @lang("icons.action_create") @lang('actions.create'){{$modelName}}
+                            @lang("icons.action_create") @lang('actions.create')新建护士长满意度调查
                         </a>
                     </div>
 
diff --git a/resources/views/admin/project/index.blade.php b/resources/views/admin/project/index.blade.php
index 6fa5247..790720d 100755
--- a/resources/views/admin/project/index.blade.php
+++ b/resources/views/admin/project/index.blade.php
@@ -34,7 +34,7 @@
                                     <a class="btn btn-sm btn-info"
                                        href="{{url("{$urlPrefix}/beds/{$row['id']}")}}"><i class="mdi mdi-bed-empty"></i> 床位管理</a>
                                     <a class="btn btn-sm btn-info"
-                                       href="{{url("/admin/asksubmit?project_id={$row['id']}")}}"><i class="mdi mdi-bed-empty"></i> 满意度调查</a>
+                                       href="{{url("{$urlPrefix}/project/asksubmit/{$row['id']}")}}"><i class="mdi mdi-bed-empty"></i> 护士长满意度调查</a>
                                     <a class="btn btn-sm btn-primary"
                                        href="{{url("{$urlPrefix}/edit?id={$row['id']}")}}">@lang("icons.action_edit") @lang("actions.edit")</a>
                                     <a class="btn btn-sm btn-danger btn-delete" data-id="{{$row['id']}}"
diff --git a/routes/web.php b/routes/web.php
index e3d44c8..110ccaf 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -41,15 +41,12 @@ Route::group(["namespace" => "Admin", "prefix" => "admin"], function () {
 
         \App\Models\CommonModel::generateCurdRouter("ProjectController", "project");
         Route::get("project/beds/{id}", 'ProjectController@beds');
-        Route::get("project/ask_submit/{id}", 'ProjectController@askSubmit');
+        Route::get("project/asksubmit/{id}", 'ProjectController@askSubmit');
         Route::get("project/get-subs", 'ProjectController@getSubs');
         Route::post("project/create-sub", 'ProjectController@createSub');
         Route::get("project/get-head", 'ProjectController@getHeadList');
         Route::post("project/ask_submit_create", 'ProjectController@askSubmitCreate');
 
-        // 满意度调查
-        \App\Models\CommonModel::generateCurdRouter("AsksubmitController", "asksubmit");
-
 
         Route::post("project/edit-department", 'ProjectController@editDepartment');
         Route::post("project/delete-department", 'ProjectController@deleteDepartment');