1

app/Http/Controllers/Api/OaController.php

@@ -329,6 +329,17 @@ class OaController extends BaseController
             return $this->json_return(201,$data);
         }
     }
+    public function reportTime(Request $request){
+
+        $service = new OaService();
+        list($status,$data) = $service->reportTime($request->all());
+
+        if($status){
+            return $this->json_return(200,'',$data);
+        }else{
+            return $this->json_return(201,$data);
+        }
+    }
 
 
     public function oaGetTeamDetail(Request $request){

app/Service/OaService.php

@@ -243,7 +243,7 @@ class OaService extends Service
             $id = $oa->id;
             $insert = [];
 
-            $oa_sub_id = OaSub::where('oa_id', $id)->pluck('id')->toArray();
+            $oa_sub_id = OaSub::where('oa_id', $id)->where('del_time',0)->pluck('id')->toArray();
             OaSub::where('oa_id', $id)->update([
                 'del_time' => time()
             ]);
@@ -339,8 +339,8 @@ class OaService extends Service
                 $n++;
             }
         }
-        OaSubRule::where('oa_sub_id', $oa_sub_id)->delete();
-        OaSubEmployee::where('oa_sub_id', $oa_sub_id)->delete();
+        OaSubRule::wherein('oa_sub_id', $oa_sub_id)->delete();
+        OaSubEmployee::wherein('oa_sub_id', $oa_sub_id)->delete();
         OaSubRule::insert($set_list);
         OaSubEmployee::insert($employee_list);
         if (!empty($report_list)) OaSubReportEmployee::insert($report_list);
@@ -598,7 +598,7 @@ class OaService extends Service
                 'state' => $state,
                 'remark' => $remark,
             ]);
-            $this->report($oaOrder, $detail['oa_sub_id']);
+            $this->report($oaOrder, $detail['oa_sub_id'],$user_id);
             DB::commit();
             return [true, '操作成功！'];
         } catch (\Exception $e) {
@@ -832,4 +832,9 @@ class OaService extends Service
             ->select('oo.*','o.id as sid','o.check')->get()->toArray();
         return [true,['total'=>count($list),'list'=>$list]];
     }
+
+    public function reportTime($data){
+
+        return [true,['time'=>'20小时10分钟']];
+    }
 }

routes/api.php

@@ -44,6 +44,7 @@ Route::group(['middleware'=> ['checkLogin']],function ($route){
     $route->any('reportList', 'Api\OaController@reportList');
     $route->any('reportCount', 'Api\OaController@reportCount');
     $route->any('reportCheck', 'Api\OaController@reportCheck');
+    $route->any('reportTime', 'Api\OaController@reportTime');
     //审批流参数
     $route->any('oaParamGet','Api\OaController@oaParamGet');