风险作业接口修改

Modules/Camera/Http/Controllers/Api/CameraApiController.php

@@ -2139,9 +2139,9 @@ class CameraApiController extends BaseController
 
     //主屏幕
     public function mainHomeV2(Request $request){
-        $gao = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereDate('create_time', today())->where('risk_level',0)->count();
-        $zhong = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereDate('create_time', today())->where('risk_level',1)->count();
-        $di = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereDate('create_time', today())->where('risk_level',2)->count();
+        $gao = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereDate('create_time', today())->where('risk_level',0)->where('is_delete',0)->count();
+        $zhong = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereDate('create_time', today())->where('risk_level',1)->where('is_delete',0)->count();
+        $di = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereDate('create_time', today())->where('risk_level',2)->where('is_delete',0)->count();
 
         $result = [
             [
@@ -2169,9 +2169,9 @@ class CameraApiController extends BaseController
 
     //风险作业占比
     public function riskWorkPercentV2(Request $request){
-        $gao = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereDate('create_time', today())->where('risk_level',0)->count();
-        $zhong = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereDate('create_time', today())->where('risk_level',1)->count();
-        $di = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereDate('create_time', today())->where('risk_level',2)->count();
+        $gao = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereDate('create_time', today())->where('risk_level',0)->where('is_delete',0)->count();
+        $zhong = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereDate('create_time', today())->where('risk_level',1)->where('is_delete',0)->count();
+        $di = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereDate('create_time', today())->where('risk_level',2)->where('is_delete',0)->count();
 
         $result = [
             [
@@ -2193,12 +2193,12 @@ class CameraApiController extends BaseController
 
     //片区占比
     public function areaPercentV2(Request $request){
-        $area = DB::connection('mysql_fwe10')->table('uf_xx_area')->get();
+        $area = DB::connection('mysql_fwe10')->table('uf_xx_area')->where('is_delete',0)->get();
 
         if(count($area) > 0){
             for($i=0;$i<count($area);$i++){
-                $coal_washery_id_list = DB::connection('mysql_fwe10')->table('uf_xx_coal_washery')->where('area_id',$area[$i]->ID)->pluck('id');
-                $result[$i]['value'] = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereIn('coal_washery_id',$coal_washery_id_list)->whereDate('create_time', today())->count();
+                $coal_washery_id_list = DB::connection('mysql_fwe10')->table('uf_xx_coal_washery')->where('area_id',$area[$i]->ID)->where('is_delete',0)->pluck('id');
+                $result[$i]['value'] = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereIn('coal_washery_id',$coal_washery_id_list)->whereDate('create_time', today())->where('is_delete',0)->count();
                 $result[$i]['name'] = $area[$i]->title;
             }
         }
@@ -2208,7 +2208,7 @@ class CameraApiController extends BaseController
 
     //地图数据
     public function mapDataV2(Request $request){
-        $coal_washery = DB::connection('mysql_fwe10')->table('uf_xx_coal_washery')->get();
+        $coal_washery = DB::connection('mysql_fwe10')->table('uf_xx_coal_washery')->where('is_delete',0)->get();
         $coal_list = [
             '灵新洗煤厂'=>'linxing',
             '红柳洗煤厂'=>'hongliu',
@@ -2238,24 +2238,24 @@ class CameraApiController extends BaseController
                     $result['map_data'][$slog]['data'] = [
                         [
                             'name' => '高风险作业',
-                            'value'=> DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->where('coal_washery_id',$coal_washery[$i]->ID)->where('risk_level',0)->whereDate('create_time', today())->count()
+                            'value'=> DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->where('coal_washery_id',$coal_washery[$i]->ID)->where('risk_level',0)->whereDate('create_time', today())->where('is_delete',0)->count()
                         ],
                         [
                             'name' => '中风险作业',
-                            'value'=> DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->where('coal_washery_id',$coal_washery[$i]->ID)->where('risk_level',1)->whereDate('create_time', today())->count()
+                            'value'=> DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->where('coal_washery_id',$coal_washery[$i]->ID)->where('risk_level',1)->whereDate('create_time', today())->where('is_delete',0)->count()
                         ],
                         [
                             'name' => '低风险作业',
-                            'value'=> DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->where('coal_washery_id',$coal_washery[$i]->ID)->where('risk_level',2)->whereDate('create_time', today())->count()
+                            'value'=> DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->where('coal_washery_id',$coal_washery[$i]->ID)->where('risk_level',2)->whereDate('create_time', today())->where('is_delete',0)->count()
                         ]
                     ];
                 }else{
                     array_push($result['other_data'],[
                         'title'=> $coal_washery[$i]->title,
                         'id'   => $coal_washery[$i]->ID,
-                        'gao'  => DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->where('coal_washery_id',$coal_washery[$i]->ID)->where('risk_level',0)->whereDate('create_time', today())->count(),
-                        'zhong'=> DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->where('coal_washery_id',$coal_washery[$i]->ID)->where('risk_level',1)->whereDate('create_time', today())->count(),
-                        'di'   => DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->where('coal_washery_id',$coal_washery[$i]->ID)->where('risk_level',2)->whereDate('create_time', today())->count()
+                        'gao'  => DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->where('coal_washery_id',$coal_washery[$i]->ID)->where('risk_level',0)->whereDate('create_time', today())->where('is_delete',0)->count(),
+                        'zhong'=> DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->where('coal_washery_id',$coal_washery[$i]->ID)->where('risk_level',1)->whereDate('create_time', today())->where('is_delete',0)->count(),
+                        'di'   => DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->where('coal_washery_id',$coal_washery[$i]->ID)->where('risk_level',2)->whereDate('create_time', today())->where('is_delete',0)->count()
                     ]);
                 }
             }
@@ -2316,9 +2316,9 @@ class CameraApiController extends BaseController
 
         while ($current_date <= $end_date) {
             array_push($result['xAxis']['data'],$current_date);
-            array_push($result['series'][0]['data'],DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereDate('create_time', $current_date)->where('risk_level',0)->count());
-            array_push($result['series'][1]['data'],DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereDate('create_time', $current_date)->where('risk_level',1)->count());
-            array_push($result['series'][2]['data'],DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereDate('create_time', $current_date)->where('risk_level',2)->count());
+            array_push($result['series'][0]['data'],DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereDate('create_time', $current_date)->where('risk_level',0)->where('is_delete',0)->count());
+            array_push($result['series'][1]['data'],DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereDate('create_time', $current_date)->where('risk_level',1)->where('is_delete',0)->count());
+            array_push($result['series'][2]['data'],DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereDate('create_time', $current_date)->where('risk_level',2)->where('is_delete',0)->count());
             $current_date = date('Y-m-d', strtotime($current_date . ' +1 day'));
             $i++;
         }
@@ -2333,7 +2333,7 @@ class CameraApiController extends BaseController
         if (isset($params['area_id'])) {
             $area_id = $params['area_id'];
         }else{
-            $area_id = DB::connection('mysql_fwe10')->table('uf_xx_area')->first()->ID;
+            $area_id = DB::connection('mysql_fwe10')->table('uf_xx_area')->where('is_delete',0)->first()->ID;
         }
 
         if(isset($params['start_date']) && isset($params['end_date'])){
@@ -2344,7 +2344,7 @@ class CameraApiController extends BaseController
             $end_date = date('Y-m-d');
         }
 
-        $coal_washery_id_list = DB::connection('mysql_fwe10')->table('uf_xx_coal_washery')->where('area_id',$area_id)->pluck('id');
+        $coal_washery_id_list = DB::connection('mysql_fwe10')->table('uf_xx_coal_washery')->where('area_id',$area_id)->where('is_delete',0)->pluck('id');
 
         $result = [];
         $current_date = $start_date;
@@ -2353,19 +2353,19 @@ class CameraApiController extends BaseController
         //当日片区数
         $result['data'] = [
             [
-                'number' => DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereIn('coal_washery_id',$coal_washery_id_list)->whereDate('create_time', date('Y-m-d'))->where('risk_level',0)->count(),
+                'number' => DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereIn('coal_washery_id',$coal_washery_id_list)->whereDate('create_time', date('Y-m-d'))->where('risk_level',0)->where('is_delete',0)->count(),
                 'unit'   => '项',
                 'title'  => '高风险作业',
                 'color'  => '#DA0000'
             ],
             [
-                'number' => DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereIn('coal_washery_id',$coal_washery_id_list)->whereDate('create_time', date('Y-m-d'))->where('risk_level',1)->count(),
+                'number' => DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereIn('coal_washery_id',$coal_washery_id_list)->whereDate('create_time', date('Y-m-d'))->where('risk_level',1)->where('is_delete',0)->count(),
                 'unit'   => '项',
                 'title'  => '中风险作业',
                 'color'  => '#FFBA00'
             ],
             [
-                'number' => DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereIn('coal_washery_id',$coal_washery_id_list)->whereDate('create_time', date('Y-m-d'))->where('risk_level',2)->count(),
+                'number' => DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereIn('coal_washery_id',$coal_washery_id_list)->whereDate('create_time', date('Y-m-d'))->where('risk_level',2)->where('is_delete',0)->count(),
                 'unit'   => '项',
                 'title'  => '低风险作业',
                 'color'  => '#2BB200'
@@ -2406,9 +2406,9 @@ class CameraApiController extends BaseController
 
         while ($current_date <= $end_date) {
             array_push($result['xAxis']['data'],$current_date);
-            array_push($result['series'][0]['data'],DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereIn('coal_washery_id',$coal_washery_id_list)->whereDate('create_time', $current_date)->where('risk_level',0)->count());
-            array_push($result['series'][1]['data'],DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereIn('coal_washery_id',$coal_washery_id_list)->whereDate('create_time', $current_date)->where('risk_level',1)->count());
-            array_push($result['series'][2]['data'],DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereIn('coal_washery_id',$coal_washery_id_list)->whereDate('create_time', $current_date)->where('risk_level',2)->count());
+            array_push($result['series'][0]['data'],DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereIn('coal_washery_id',$coal_washery_id_list)->whereDate('create_time', $current_date)->where('risk_level',0)->where('is_delete',0)->count());
+            array_push($result['series'][1]['data'],DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereIn('coal_washery_id',$coal_washery_id_list)->whereDate('create_time', $current_date)->where('risk_level',1)->where('is_delete',0)->count());
+            array_push($result['series'][2]['data'],DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereIn('coal_washery_id',$coal_washery_id_list)->whereDate('create_time', $current_date)->where('risk_level',2)->where('is_delete',0)->count());
             $current_date = date('Y-m-d', strtotime($current_date . ' +1 day'));
             $i++;
         }
@@ -2423,10 +2423,10 @@ class CameraApiController extends BaseController
         if(isset($params['area_id'])){
             $area = [$params['area_id']];
         }else{
-            $area = DB::connection('mysql_fwe10')->table('uf_xx_area')->pluck('id');
+            $area = DB::connection('mysql_fwe10')->table('uf_xx_area')->where('is_delete',0)->pluck('id');
         }
 
-        $coal_washery = DB::connection('mysql_fwe10')->table('uf_xx_coal_washery')->whereIn('area_id',$area)->get();
+        $coal_washery = DB::connection('mysql_fwe10')->table('uf_xx_coal_washery')->whereIn('area_id',$area)->where('is_delete',0)->get();
 
         if(count($coal_washery) > 0){
             for($i=0;$i<count($coal_washery);$i++){
@@ -2436,17 +2436,17 @@ class CameraApiController extends BaseController
                 $result[$i]['data'] = [
                     [
                         'label' => '高',
-                        'value' => DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->where('coal_washery_id',$coal_washery[$i]->ID)->where('risk_level',0)->whereDate('create_time', today())->count(),
+                        'value' => DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->where('coal_washery_id',$coal_washery[$i]->ID)->where('risk_level',0)->whereDate('create_time', today())->where('is_delete',0)->count(),
                         'color' => '#DA0000'
                     ],
                     [
                         'label' => '中',
-                        'value' => DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->where('coal_washery_id',$coal_washery[$i]->ID)->where('risk_level',1)->whereDate('create_time', today())->count(),
+                        'value' => DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->where('coal_washery_id',$coal_washery[$i]->ID)->where('risk_level',1)->whereDate('create_time', today())->where('is_delete',0)->count(),
                         'color' => '#FFBA00'
                     ],
                     [
                         'label' => '低',
-                        'value' => DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->where('coal_washery_id',$coal_washery[$i]->ID)->where('risk_level',2)->whereDate('create_time', today())->count(),
+                        'value' => DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->where('coal_washery_id',$coal_washery[$i]->ID)->where('risk_level',2)->whereDate('create_time', today())->where('is_delete',0)->count(),
                         'color' => '#2BB200'
                     ],
                 ];
@@ -2468,13 +2468,13 @@ class CameraApiController extends BaseController
 
         $list = [];
         if(isset($params['area_id'])){
-            $list = DB::connection('mysql_fwe10')->table('uf_xx_coal_washery')->where('area_id',$params['area_id'])->pluck('id');
+            $list = DB::connection('mysql_fwe10')->table('uf_xx_coal_washery')->where('area_id',$params['area_id'])->where('is_delete',0)->pluck('id');
         }
         if(isset($params['coal_washery_id'])){
             $list = [$params['coal_washery_id']];
         }
 
-        $coal_washery_list = DB::connection('mysql_fwe10')->table('uf_xx_coal_washery')->get();
+        $coal_washery_list = DB::connection('mysql_fwe10')->table('uf_xx_coal_washery')->where('is_delete',0)->get();
         if(count($coal_washery_list) > 0){
             for($i=0;$i<count($coal_washery_list);$i++){
                 $result['unit_list'][$i]['text'] = $coal_washery_list[$i]->title;
@@ -2488,7 +2488,7 @@ class CameraApiController extends BaseController
         if(count($list) > 0){
             $risk = $risk->whereIn('coal_washery_id',$list);
         }
-        $risk = $risk->whereDate('uf_xx_risk_assignment.create_time', today());
+        $risk = $risk->whereDate('uf_xx_risk_assignment.create_time', today())->where('uf_xx_risk_assignment.is_delete',0);
 
         if(isset($params['id'])){
             $risk = $risk->where('uf_xx_coal_washery.id',$params['id']);
@@ -2538,7 +2538,7 @@ class CameraApiController extends BaseController
         $risk = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')
             ->select('uf_xx_risk_assignment.*','uf_xx_coal_washery.name as coal_washery')
             ->leftJoin('uf_xx_coal_washery','uf_xx_coal_washery.id','=','uf_xx_risk_assignment.coal_washery_id')
-            ->where('uf_xx_risk_assignment.id',$params['id'])->get();
+            ->where('uf_xx_risk_assignment.id',$params['id'])->where('uf_xx_risk_assignment.is_delete',0)->get();
 
         if(count($risk) > 0){
             $camera_info = explode(',',$risk[0]->camera);
@@ -2641,7 +2641,7 @@ class CameraApiController extends BaseController
             ->select('uf_xx_risk_assignment.*','uf_xx_coal_washery.name as coal_washery')
             ->leftJoin('uf_xx_coal_washery','uf_xx_coal_washery.id','=','uf_xx_risk_assignment.coal_washery_id')
             ->whereDate('uf_xx_risk_assignment.create_time', today())
-            ->where('risk_level',0)->get();
+            ->where('risk_level',0)->where('uf_xx_risk_assignment.is_delete',0)->get();
         if(count($gaofengxian) > 0){
             for($i=0;$i<count($gaofengxian);$i++){
                 if($gaofengxian[$i]->risk_type == ''){
@@ -2663,7 +2663,7 @@ class CameraApiController extends BaseController
             ->select('uf_xx_risk_assignment.*','uf_xx_coal_washery.name as coal_washery')
             ->leftJoin('uf_xx_coal_washery','uf_xx_coal_washery.id','=','uf_xx_risk_assignment.coal_washery_id')
             ->whereDate('uf_xx_risk_assignment.create_time', today())
-            ->where('risk_level',1)->get();
+            ->where('risk_level',1)->where('uf_xx_risk_assignment.is_delete',0)->get();
         if(count($zhongfengxian) > 0){
             for($i=0;$i<count($zhongfengxian);$i++){
                 if($zhongfengxian[$i]->risk_type == ''){
@@ -2684,7 +2684,7 @@ class CameraApiController extends BaseController
             ->select('uf_xx_risk_assignment.*','uf_xx_coal_washery.name as coal_washery')
             ->leftJoin('uf_xx_coal_washery','uf_xx_coal_washery.id','=','uf_xx_risk_assignment.coal_washery_id')
             ->whereDate('uf_xx_risk_assignment.create_time', today())
-            ->where('risk_level',2)->get();
+            ->where('risk_level',2)->where('uf_xx_risk_assignment.is_delete',0)->get();
         if(count($difengxian) > 0){
             for($i=0;$i<count($difengxian);$i++){
                 if($difengxian[$i]->risk_type == ''){
@@ -2707,19 +2707,19 @@ class CameraApiController extends BaseController
             for($i=0;$i<count($area);$i++){
                 $result['area_count'][$i]['name'] = $area[$i]->title;
                 $coal_washery_id_list = DB::connection('mysql_fwe10')->table('uf_xx_coal_washery')->where('area_id',$area[$i]->ID)->pluck('id');
-                $result['area_count'][$i]['count'] = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereIn('coal_washery_id',$coal_washery_id_list)->whereDate('create_time', today())->count();
+                $result['area_count'][$i]['count'] = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereIn('coal_washery_id',$coal_washery_id_list)->whereDate('create_time', today())->where('is_delete',0)->count();
             }
         }
 
         //洗煤厂作业
-        $coal_washery = DB::connection('mysql_fwe10')->table('uf_xx_coal_washery')->get();
+        $coal_washery = DB::connection('mysql_fwe10')->table('uf_xx_coal_washery')->where('is_delete',0)->get();
         $result['coal_washery_work_count'] = [];
         if(count($coal_washery) > 0){
             for($i=0;$i<count($coal_washery);$i++){
                 $result['coal_washery_work_count'][$i]['name'] = $coal_washery[$i]->title;
-                $result['coal_washery_work_count'][$i]['gao'] = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->where('coal_washery_id',$coal_washery[$i]->ID)->where('risk_level',0)->whereDate('create_time', today())->count();
-                $result['coal_washery_work_count'][$i]['zhong'] = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->where('coal_washery_id',$coal_washery[$i]->ID)->where('risk_level',1)->whereDate('create_time', today())->count();
-                $result['coal_washery_work_count'][$i]['di'] = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->where('coal_washery_id',$coal_washery[$i]->ID)->where('risk_level',2)->whereDate('create_time', today())->count();
+                $result['coal_washery_work_count'][$i]['gao'] = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->where('coal_washery_id',$coal_washery[$i]->ID)->where('risk_level',0)->whereDate('create_time', today())->where('is_delete',0)->count();
+                $result['coal_washery_work_count'][$i]['zhong'] = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->where('coal_washery_id',$coal_washery[$i]->ID)->where('risk_level',1)->whereDate('create_time', today())->where('is_delete',0)->count();
+                $result['coal_washery_work_count'][$i]['di'] = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->where('coal_washery_id',$coal_washery[$i]->ID)->where('risk_level',2)->whereDate('create_time', today())->where('is_delete',0)->count();
             }
         }
 
@@ -2728,9 +2728,9 @@ class CameraApiController extends BaseController
         for($i=0;$i<7;$i++){
             $day = date('Y-m-d', strtotime('-'.$i.' day'));
             $result['seven_work_count'][$i]['date'] = $day;
-            $result['seven_work_count'][$i]['gao'] = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereDate('create_time', $day)->where('risk_level',0)->count();
-            $result['seven_work_count'][$i]['zhong'] = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereDate('create_time', $day)->where('risk_level',1)->count();
-            $result['seven_work_count'][$i]['di'] = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereDate('create_time', $day)->where('risk_level',2)->count();
+            $result['seven_work_count'][$i]['gao'] = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereDate('create_time', $day)->where('risk_level',0)->where('is_delete',0)->count();
+            $result['seven_work_count'][$i]['zhong'] = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereDate('create_time', $day)->where('risk_level',1)->where('is_delete',0)->count();
+            $result['seven_work_count'][$i]['di'] = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereDate('create_time', $day)->where('risk_level',2)->where('is_delete',0)->count();
         }
 
         //7天片区作业数
@@ -2742,10 +2742,10 @@ class CameraApiController extends BaseController
                 for($j=0;$j<7;$j++){
                     $day = date('Y-m-d', strtotime('-'.$j.' day'));
                     $result['seven_area_work_count'][$i]['work'][$j]['date'] = $day;
-                    $coal_washery_id_list = DB::connection('mysql_fwe10')->table('uf_xx_coal_washery')->where('area_id',$area[$i]->ID)->pluck('id');
-                    $result['seven_area_work_count'][$i]['work'][$j]['gao'] = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereIn('coal_washery_id',$coal_washery_id_list)->whereDate('create_time', $day)->where('risk_level',0)->count();
-                    $result['seven_area_work_count'][$i]['work'][$j]['zhong'] = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereIn('coal_washery_id',$coal_washery_id_list)->whereDate('create_time', $day)->where('risk_level',1)->count();
-                    $result['seven_area_work_count'][$i]['work'][$j]['di'] = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereIn('coal_washery_id',$coal_washery_id_list)->whereDate('create_time', $day)->where('risk_level',2)->count();
+                    $coal_washery_id_list = DB::connection('mysql_fwe10')->table('uf_xx_coal_washery')->where('area_id',$area[$i]->ID)->where('is_delete',0)->pluck('id');
+                    $result['seven_area_work_count'][$i]['work'][$j]['gao'] = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereIn('coal_washery_id',$coal_washery_id_list)->whereDate('create_time', $day)->where('risk_level',0)->where('is_delete',0)->count();
+                    $result['seven_area_work_count'][$i]['work'][$j]['zhong'] = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereIn('coal_washery_id',$coal_washery_id_list)->whereDate('create_time', $day)->where('risk_level',1)->where('is_delete',0)->count();
+                    $result['seven_area_work_count'][$i]['work'][$j]['di'] = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereIn('coal_washery_id',$coal_washery_id_list)->whereDate('create_time', $day)->where('risk_level',2)->where('is_delete',0)->count();
                 }
             }
         }
@@ -2772,9 +2772,9 @@ class CameraApiController extends BaseController
         $i = 0;
         while ($current_date <= $end_date) {
             $result[$i]['date'] = $current_date;
-            $result[$i]['gao'] = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereDate('create_time', $current_date)->where('risk_level',0)->count();
-            $result[$i]['zhong'] = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereDate('create_time', $current_date)->where('risk_level',1)->count();
-            $result[$i]['di'] = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereDate('create_time', $current_date)->where('risk_level',2)->count();
+            $result[$i]['gao'] = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereDate('create_time', $current_date)->where('risk_level',0)->where('is_delete',0)->count();
+            $result[$i]['zhong'] = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereDate('create_time', $current_date)->where('risk_level',1)->where('is_delete',0)->count();
+            $result[$i]['di'] = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereDate('create_time', $current_date)->where('risk_level',2)->where('is_delete',0)->count();
             $current_date = date('Y-m-d', strtotime($current_date . ' +1 day'));
             $i++;
         }
@@ -2798,7 +2798,7 @@ class CameraApiController extends BaseController
             return self::errorResponse(ApiEnum::STATUS_CODE_EMPTY);
         }
  
-        $coal_washery_id_list = DB::connection('mysql_fwe10')->table('uf_xx_coal_washery')->where('area_id',$params['area_id'])->pluck('id');
+        $coal_washery_id_list = DB::connection('mysql_fwe10')->table('uf_xx_coal_washery')->where('area_id',$params['area_id'])->where('is_delete',0)->pluck('id');
         $result = [];
         $start_date = $params['start_date'];
         $end_date = $params['end_date'];
@@ -2807,9 +2807,9 @@ class CameraApiController extends BaseController
 
         while ($current_date <= $end_date) {
             $result[$i]['date'] = $current_date;
-            $result[$i]['gao'] = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereIn('coal_washery_id',$coal_washery_id_list)->whereDate('create_time', $current_date)->where('risk_level',0)->count();
-            $result[$i]['zhong'] = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereIn('coal_washery_id',$coal_washery_id_list)->whereDate('create_time', $current_date)->where('risk_level',1)->count();
-            $result[$i]['di'] = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereIn('coal_washery_id',$coal_washery_id_list)->whereDate('create_time', $current_date)->where('risk_level',2)->count();
+            $result[$i]['gao'] = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereIn('coal_washery_id',$coal_washery_id_list)->whereDate('create_time', $current_date)->where('risk_level',0)->where('is_delete',0)->count();
+            $result[$i]['zhong'] = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereIn('coal_washery_id',$coal_washery_id_list)->whereDate('create_time', $current_date)->where('risk_level',1)->where('is_delete',0)->count();
+            $result[$i]['di'] = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereIn('coal_washery_id',$coal_washery_id_list)->whereDate('create_time', $current_date)->where('risk_level',2)->where('is_delete',0)->count();
             $current_date = date('Y-m-d', strtotime($current_date . ' +1 day'));
             $i++;
         }