1

app/Http/Controllers/Api/OaController.php

@@ -306,6 +306,29 @@ class OaController extends BaseController
             return $this->json_return(201,$data);
         }
     }
+    public function reportCount(Request $request){
+
+        $service = new OaService();
+        $userData = $request->userData->toArray();
+        list($status,$data) = $service->reportCount($request->all(),$userData);
+
+        if($status){
+            return $this->json_return(200,'',$data);
+        }else{
+            return $this->json_return(201,$data);
+        }
+    }
+    public function reportCheck(Request $request){
+
+        $service = new OaService();
+        list($status,$data) = $service->reportCheck($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

@@ -628,7 +628,6 @@ class OaService extends Service
         OaReportOrderEmployee::insert($list);
     }
 
-
     public function returnOa($order_no, $type, $opt_case)
     {
         $service = new CheckService();
@@ -805,10 +804,30 @@ class OaService extends Service
             ->leftJoin('oa_report_order as o','o.id','e.oa_report_order_id')
             ->leftJoin('oa_order as oo','oo.order_no','o.order_no')
             ->where('e.employee_id',$id)->groupBy('oo.id')->orderBy('oo.id','desc')
-            ->select('oo.*');
+            ->select('oo.*','o.id as sid','o.check');
         $list = $this->limit($list,'',$data);
 
         return [true,$list];
 
     }
+
+
+    public function reportCheck($data){
+        $id = $data['sid'];
+        $report = OaReportOrder::wherein('id',$id)->first();
+        $report->check = 1;
+        $report->save();
+        return [true,''];
+    }
+    public function reportCount($data,$user){
+        $id = $user['id'];
+        $list = OaReportOrder::from('oa_report_order_employee as e')
+            ->leftJoin('oa_report_order as o','o.id','e.oa_report_order_id')
+            ->leftJoin('oa_order as oo','oo.order_no','o.order_no')
+            ->where('e.employee_id',$id)
+            ->where('o.check',0)
+            ->groupBy('oo.id')->orderBy('oo.id','desc')
+            ->select('oo.*','o.id as sid','o.check')->get()->toArray();
+        return [true,['total'=>count($list),'list'=>$list]];
+    }
 }

routes/api.php

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