优化 项目控制器和服务中的部分代码 修复项目修改页面BUG

app/Contracts/ProjectServiceContract.php

@@ -11,21 +11,15 @@ namespace App\Contracts;
 
 interface ProjectServiceContract
 {
-    public function add($name ,$creator_id ,$owner_id ,$group_id ,$brief ,$cover_img);
-    public function delete($project_id);
-    public function update($id,$name ,$creator_id ,$owner_id ,$group_id ,$brief ,$cover_img);
-    public function get($project_id);
-    public function getAll();
 
+    public function getAll($group_id);
+    public function simpleSearch($id,$content,$item);
 
-    public function addTask($name,$project_id,$creator_id,$owner_id,$status,$brief,$starts_at,$ends_at);
-    public function deleteTask($id);
-    public function updateTask($id,$name,$project_id,$creator_id,$owner_id,$status,$brief,$starts_at,$ends_at);
-    public function getTask($id);
-    public function getAllTask();
 
-    public function simpleSearch($id,$content,$item);
+    public function add($name ,$creator_id ,$owner_id ,$group_id ,$brief ,$cover_img);
+    public function delete($project_id);
+    public function update($id,$name ,$creator_id ,$group_id ,$brief ,$cover_img);
+    public function get($project_id);
 
 
-    
 }
\ No newline at end of file

app/Http/Controllers/ProjectController.php

@@ -21,25 +21,26 @@ class ProjectController extends Controller
     {
         $projectid = $request->id;
         $project = $this->mProject->get($projectid);
-
-        if (count($project) > 0){
+        if (project){
             return view('admin/project/projectinformation',compact('project'));
+        }else{
+            echo '项目查不到！';
+            return back();
         }
 
     }
 
 
+
+    // 查看团队所有项目
     public function getAll(Request $request)
     {
-        $groupid = $request->id;
-
-        $projects = Group::find($groupid)->project;
-        if (count($projects) > 0){
+        $groupId = $request->id;
+        $projects = $this->mProject->getAll($groupId);
+        if ($projects){
             return view('admin/project/projecttables',compact('projects'));
         }
-        return Message::makeError('无数据！');
-
-
+        return view('admin/project/projecttables',compact('projects'));
     }
 
 
@@ -48,12 +49,12 @@ class ProjectController extends Controller
     {
         $projectid= $request->id;
         $project = $this->mProject->get($projectid);
-
         $result = $project;
-        if (count($project)>0){
+        if ($project){
             return view('admin/project/update',compact('result'));
         }
-
+        echo '没有此项目！';
+        return back();
         return Message::makeError('错误');
     }
 
@@ -63,16 +64,17 @@ class ProjectController extends Controller
         $id = $request->id;
         $name = $request->name;
         $cover_img = $request->cover_img;
-        $owner_id = $request->owner_id;
+
         $creator_id = $request->creator_id;
         $group_id = $request->group_id;
         $brief = $request->brief;
-
-        $project = $this->mProject->update($id,$name ,$creator_id ,$owner_id ,$group_id ,$brief ,$cover_img);
-
+        $project = $this->mProject->update($id,$name ,$creator_id ,$group_id ,$brief ,$cover_img);
         if ($project){
             return back();
         }
+        echo '修改项目失败！';
+        return back();
+
     }
 
 

app/Http/Controllers/UserController.php

@@ -55,7 +55,6 @@ class UserController extends Controller
             if ($head_icon == null){
                 $head_icon = null;
             }
-
             $result = $this->mUser->update($id,$phone,$user_name,$real_name,$gender,$email,$head_icon);
 
             if ($result){

app/Models/Group.php

@@ -28,6 +28,6 @@ class Group extends Model
 
     public function project()
     {
-        return $this->hasMany('App\Models\Project','creator_id');
+        return $this->hasMany('App\Models\Project','group_id','id');
     }
 }

app/Models/Project.php

@@ -13,7 +13,7 @@ class Project extends Model
 
     public function group()
     {
-        return $this->hasOne('App\Models\Group','id','creator_id');
+        return $this->hasOne('App\Models\Group','id','group_id');
     }
 
     public function tasks()

app/Services/ProjectService.php

@@ -49,7 +49,7 @@ class ProjectService implements ProjectServiceContract
         }
     }
 
-    public function update($id, $name, $creator_id, $owner_id, $group_id, $brief, $cover_img)
+    public function update($id, $name, $creator_id,$group_id, $brief, $cover_img)
     {
         $project = Project::find($id);
 
@@ -57,7 +57,7 @@ class ProjectService implements ProjectServiceContract
             return false;
         }
         if ($cover_img == null){
-            $project->owner_id = $owner_id;
+
             $project->creator_id = $creator_id;
             $project->name = $name;
             $project->brief = $brief;
@@ -67,7 +67,7 @@ class ProjectService implements ProjectServiceContract
             $upload = new UploadPhoto();
             $imgPath = $upload->upload($cover_img);
 
-            $project->owner_id = $owner_id;
+
             $project->creator_id = $creator_id;
             $project->name = $name;
             $project->cover_img = $imgPath;
@@ -86,9 +86,6 @@ class ProjectService implements ProjectServiceContract
     public function get($project_id)
     {
         $project = Project::find($project_id);
-
-
-
         if ($project == null){
             return null;
         }else{
@@ -96,10 +93,10 @@ class ProjectService implements ProjectServiceContract
         }
     }
 
-    public function getAll()
+    public function getAll($group_id)
     {
-        $projects = Project::all();
-        if($projects == null){
+        $projects = Group::find($group_id)->project;
+        if($projects->isEmpty()){
             return null;
         }else{
             return $projects;
@@ -108,88 +105,6 @@ class ProjectService implements ProjectServiceContract
 
 
 
-    public function addTask($name, $project_id, $creator_id, $owner_id, $status, $brief, $starts_at, $ends_at)
-    {
-        $task = new Task();
-        $task->name = $name;
-        $task->project_id = $project_id;
-        $task->creator_id = $creator_id;
-        $task->owner_id = $owner_id;
-        $task->status = $status;
-        $task->brief = $brief;
-        $task->starts_at = $starts_at;
-        $task->ends_at = $ends_at;
-
-        $result = $task->save();
-        if ($result){
-            return true;
-        }else{
-            return false;
-        }
-    }
-
-
-    public function deleteTask($id)
-    {
-        $task = Task::find($id);
-
-        if ($task == null){
-            return false;
-        }
-        if ($task->delete()){
-            return true;
-        }else{
-            return false;
-        }
-    }
-
-
-    public function updateTask($id, $name, $project_id, $creator_id, $owner_id, $status, $brief, $starts_at, $ends_at)
-    {
-
-        $task = Task::find($id);
-        if ($task == null){
-            return false;
-        }
-        $task->name = $name;
-        $task->project_id = $project_id;
-        $task->creator_id = $creator_id;
-        $task->owner_id = $owner_id;
-        $task->status = $status;
-        $task->brief = $brief;
-        $task->starts_at = $starts_at;
-        $task->ends_at = $ends_at;
-        $result = $task->update();
-
-        if ($result){
-            return true;
-        }else{
-            return false;
-        }
-    }
-
-
-    public function getTask($id)
-    {
-        $task = Task::find($id);
-        if ($task == null){
-            return null;
-        }else{
-            return $task;
-        }
-    }
-
-
-    public function getAllTask()
-    {
-        $tasks = Task::all();
-        if($tasks == null){
-            return null;
-        }else{
-            return $tasks;
-        }
-    }
-
 
     public function simpleSearch($id,$content, $item)
     {

resources/views/admin/project/update.blade.php

@@ -24,18 +24,18 @@
             </div>
             <div class="form-group">
                 <label for="exampleInputEmail1">项目名称</label>
-                <input type="text" class="form-control" id="exampleInputEmail1" placeholder="User_email" name="name" value="{{$result['name']}}">
+                <input type="text" class="form-control" id="exampleInputEmail1" name="name" value="{{$result['name']}}">
                 <input type="hidden"  name="id" value="{{$result['id']}}">
                 <input type="hidden"  name="group_id" value="{{$result->group['id']}}">
             </div>
             <div class="form-group">
                 <label for="exampleInputEmail1">项目创建者</label>
-                <input type="text" class="form-control" id="exampleInputEmail1" placeholder="User_email"  value="{{$result->group['name']}}" readonly>
+                <input type="text" class="form-control" id="exampleInputEmail1"   value="{{$result->group->creator['user_name']}}" readonly>
                 <input type="hidden"  name="creator_id" value="{{$result['creator_id']}}">
             </div>
             <div class="form-group">
                 <label for="exampleInputEmail1">项目拥有者</label>
-                <input type="text" class="form-control" id="exampleInputEmail1" placeholder="User_email"  value="{{$result->group['name']}}" readonly>
+                <input type="text" class="form-control" id="exampleInputEmail1"  value="{{$result->group->owner['user_name']}}" readonly>
                 <input type="hidden"  name="owner_id" value="{{$result['owner_id']}}">
             </div>
             <div class="form-group">

resources/views/admin/sidebar.blade.php

@@ -70,8 +70,8 @@
             </span>
                     </a>
                     <ul class="treeview-menu">
-                        <li><a href="{{url('auth/getAll')}}">权限列表</a></li>
-                        <li><a href="{{url('auth/add')}}">新增权限</a></li>
+                        <li><a href="#">权限列表</a></li>
+                        <li><a href="#">新增权限</a></li>
                         {{--<li><a href="#">Link in level 2</a></li>--}}
                     </ul>