cqp преди 10 месеца
родител
ревизия
f0bf51a795
променени са 4 файла, в които са добавени 29 реда и са изтрити 4 реда
  1. 0 3
      app/Http/Controllers/Api/OaController.php
  2. 12 0
      app/Http/Controllers/Api/WorkFlowController.php
  3. 16 1
      app/Service/WorkFlowService.php
  4. 1 0
      routes/api.php

+ 0 - 3
app/Http/Controllers/Api/OaController.php

@@ -311,9 +311,6 @@ class OaController extends BaseController
 
     public function oaParamGet(Request $request){
         $oa = config('oa');
-        foreach ($oa as $key => $value){
-            if($value['menu_id'] == 16) unset($oa[$key]);
-        }
 
         return $this->json_return(200,'', $oa);
     }

+ 12 - 0
app/Http/Controllers/Api/WorkFlowController.php

@@ -54,5 +54,17 @@ class WorkFlowController extends BaseController
             return $this->json_return(201,$data);
         }
     }
+
+    public function create(Request $request){
+        $service = new WorkFlowService();
+        $user = $request->userData->toArray();
+        list($status,$data) = $service->create($request->all(),$user);
+
+        if($status){
+            return $this->json_return(200,'',$data);
+        }else{
+            return $this->json_return(201,$data);
+        }
+    }
 }
 

+ 16 - 1
app/Service/WorkFlowService.php

@@ -14,7 +14,7 @@ class WorkFlowService extends Service
 {
     public function orderList($data,$user){
         $model = WorkFlow::where('del_time',0)
-            ->select('title','id','menu_id','crt_time')
+            ->select('title','id','menu_id','crt_time','crt_id')
             ->orderby('id', 'desc');
 
         if(! empty($data['title'])) $model->where('title', 'LIKE', '%'.$data['title'].'%');
@@ -470,4 +470,19 @@ class WorkFlowService extends Service
     function settleTypeFour($tmp, $value, &$return){
         $return[] = $tmp;
     }
+
+    //触发工作流并生成
+    public function create($data, $user){
+        list($status, $msg) = $this->createRule($data, $user);
+        if(! $status) return [false, $msg];
+
+    }
+
+    public function createRule($data, $user){
+        $oa = config('oa');
+        dd($oa);
+        foreach ($oa as $key => $value){
+
+        }
+    }
 }

+ 1 - 0
routes/api.php

@@ -56,6 +56,7 @@ Route::group(['middleware'=> ['checkLogin']],function ($route){
     $route->any('workFlowDetail', 'Api\WorkFlowController@detail');
     $route->any('workFlowList', 'Api\WorkFlowController@orderList');
     $route->any('workFlowDel', 'Api\WorkFlowController@del');
+    $route->any('workFlowCreate', 'Api\WorkFlowController@create');
 
     //触发审批
     $route->any('checkAll', 'Api\CheckController@checkAll');