审核人去重、按片区筛选数据

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

@@ -2910,7 +2910,7 @@ class CameraApiController extends BaseController
 
         $date = $request->query('date', date('Y-m-d'));
         $coal_washery_id = $request->query('coal_washery_id');
-
+        $area_id = $request->query('area_id');
 
         $classes = ['早班','中班','夜班'];
         $risk_desc = ['高风险','中风险','低风险'];
@@ -2927,11 +2927,17 @@ class CameraApiController extends BaseController
         // 风险数据
         $risk_list = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereDate('create_time', $date)->where('is_delete',0)->get();
         // 洗煤厂数据
-//        $coal_washery_list = DB::connection('mysql_fwe10')->table('uf_xx_coal_washery')->where('is_delete',0)->orderBy('sort')->get();
 
-        $coal_washery_list = DB::connection('mysql_fwe10')->table('uf_xx_coal_washery')->where('is_delete',0);
-        if (!empty($coal_washery_id)) $coal_washery_list->where('id', $coal_washery_id);
-        $coal_washery_list = $coal_washery_list->orderBy('sort')->get();
+        $coal_washery_list = DB::connection('mysql_fwe10')->table('uf_xx_coal_washery as t')->where('t.is_delete',0);
+        if (!empty($coal_washery_id)) $coal_washery_list->where('t.id', $coal_washery_id); // 筛选洗煤厂
+        // 筛选片区
+        if (!empty($area_id)) {
+            $coal_washery_list->leftJoin('uf_xx_area as t1','t1.id','=','t.area_id')
+                ->where('t1.id', $area_id);
+        }
+
+        $coal_washery_list = $coal_washery_list->select('t.*')->orderBy('t.sort')->get();
+
 
         $coal_washery_dict = [];
         $coal_washery_type_dict = [];
@@ -3026,15 +3032,15 @@ class CameraApiController extends BaseController
                         $di++;
                     }
 
-                    $content .= ++$risk_index.".".$v->risk_name.$risk_info;
+                    $content .= ++$risk_index.".".$v->risk_name.$risk_info."";
 
                     $place .= $risk_index.".".$v->risk_location;
                     $leader .= $risk_index.".".$v->work_people;
 
-                    $reviewer = array_unique($reviewer);
                     if (isset($v->shr) && !empty($v->shr)) {
                         $reviewer[] = $v->shr;
                     }
+                    $reviewer = array_unique($reviewer);
                 }
                 $level_total = '';
                 if ($gao   > 0) $level_total .= '高风险'.$gao.'项 ';