fix:export1

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

@@ -3082,6 +3082,26 @@ class CameraApiController extends BaseController
         }
 
         $risk_list = $risk_list->orderBy('risk_level')->get();
+        $str2="春检：";
+        // 存放春检数据
+        $temp_list=[];
+        // 存放其他数据
+        $temp_list2=[];
+        foreach ($risk_list as $key=>$value){
+            if (strstr($value->risk_name, $str2)){
+                $temp_list[] = $value;
+            }else{
+                $temp_list2[] = $value;
+            }
+        }
+        unset($risk_list);
+        $risk_list = [];
+        foreach ($temp_list2 as $key=>$value){
+            $risk_list[] = $value;
+        }
+        foreach ($temp_list as $key=>$value){
+            $risk_list[] = $value;
+        }
 
         // 洗煤厂数据
         $coal_washery_list = DB::connection('mysql_fwe10')->table('uf_xx_coal_washery as t')->where('t.is_delete',0);
@@ -3186,7 +3206,11 @@ class CameraApiController extends BaseController
                             $risk_info = '';
                             if ($v->risk_level == 0) {
                                 $gao++;
-                                $risk_info = '('.$risk_desc[$v->risk_level].'，'.$risk_type_dict[$v->risk_type].')';
+                                if($v->risk_type != null) {
+                                    $risk_info = '(' . $risk_desc[$v->risk_level] . '，' . $risk_type_dict[$v->risk_type] . ')';
+                                }else{
+                                    $risk_info = '('.$risk_desc[$v->risk_level].')';
+                                }
                             } else if ($v->risk_level == 1) {
                                 $zhong++;
                                 if($v->risk_type != null){
@@ -3200,6 +3224,7 @@ class CameraApiController extends BaseController
 
                             $content .= ++$risk_index.".".$v->risk_name.$risk_info."；\n";
 
+
                             $place .= $risk_index.".".$v->risk_location."；\n";
                             $leader .= $risk_index.".".$v->work_people."；\n";
 
@@ -3218,12 +3243,16 @@ class CameraApiController extends BaseController
                                 $gao++;
                                 if($v->risk_type != null){
                                     $risk_info = '('.$risk_desc[$v->risk_level].'，'.$risk_type_dict[$v->risk_type].')';
+                                }else{
+                                    $risk_info = '('.$risk_desc[$v->risk_level].')';
                                 }
 //                                $risk_info = '('.$risk_desc[$v->risk_level].'，'.$risk_type_dict[$v->risk_type].')';
                             } else if ($v->risk_level == 1) {
                                 $zhong++;
                                 if($v->risk_type != null){
                                     $risk_info = '('.$risk_desc[$v->risk_level].'，'.$risk_type_dict[$v->risk_type].')';
+                                }else{
+                                    $risk_info = '('.$risk_desc[$v->risk_level].')';
                                 }
 //                                $risk_info = '('.$risk_desc[$v->risk_level].'，'.$risk_type_dict[$v->risk_type].')';
                             } else {
@@ -3240,34 +3269,8 @@ class CameraApiController extends BaseController
                             }
                             $reviewer = array_unique($reviewer);
                         }
-//                        $line['index'] = ++ $index_waiwei;
-//                        $res["waiwei_list"][] = $line;
                     }
                 }
-//                $risk_index = 0;
-//                foreach ($coal_washery_risk_info_arr as $k => $v) {
-//                    $people += $v->work_num;
-//                    $risk_info = '';
-//                    if ($v->risk_level == 0) {
-//                        $gao++;
-//                        $risk_info = '('.$risk_desc[$v->risk_level].'，'.$risk_type_dict[$v->risk_type].')';
-//                    } else if ($v->risk_level == 1) {
-//                        $zhong++;
-//                        $risk_info = '('.$risk_desc[$v->risk_level].'，'.$risk_type_dict[$v->risk_type].')';
-//                    } else {
-//                        $di++;
-//                    }
-//
-//                    $content .= ++$risk_index.".".$v->risk_name.$risk_info."；\n";
-//
-//                    $place .= $risk_index.".".$v->risk_location."；";
-//                    $leader .= $risk_index.".".$v->work_people."；";
-//
-//                    if (isset($v->shr) && !empty($v->shr)) {
-//                        $reviewer[] = $v->shr;
-//                    }
-//                    $reviewer = array_unique($reviewer);
-//                }
                 $level_total = '';
                 if ($gao   > 0) $level_total .= '高风险'.$gao.'项 ';
                 if ($zhong > 0) $level_total .= '中风险'.$zhong.'项 ';