fix:export6

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

@@ -4472,6 +4472,28 @@ class CameraApiController extends BaseController
                 $sgdd = [];
 
 
+                foreach ($coal_washery_risk_info_arr as $k => $v) {
+                    if(!in_array($v->wwdw,$wwdw)){
+                        $wwdw[] = $v->wwdw;
+                    }
+                    $temp = $coal_washery_dict[$v->sgdd]->title;
+                    if (!in_array($temp,$sgdd)){
+                        $sgdd[] = $temp;
+                    }
+                }
+
+                $wwdw_num = count($wwdw);
+                $sgdd_num = count($sgdd);
+                $var1 = implode('、',$wwdw);
+                $var2 = implode('、',$sgdd);
+
+                if (++$index_1==1){
+                    $total2 .= '2.'.$index_1.'.'.$value->title.'引进委外单位'.$wwdw_num.'个（'.$var1.')，'.'作业厂点'.$sgdd_num.'个（'.$var2."）；\n";
+                } else{
+                    $total2 .= '  '.$index_1.'.'.$value->title.'引进委外单位'.$wwdw_num.'个（'.$var1.')，'.'作业厂点'.$sgdd_num.'个（'.$var2."）；\n";
+                }
+
+
                 $line = [
                     'index' => '',
                     'gao' => '',
@@ -4488,15 +4510,9 @@ class CameraApiController extends BaseController
 
                 foreach ($coal_washery_risk_info_arr as $k => $v) {
 
-                    if(!in_array($v->wwdw,$wwdw)){
-                        $wwdw[] = $v->wwdw;
-                    }
-                    $temp = $coal_washery_dict[$v->sgdd]->title;
-                    if (!in_array($temp,$sgdd)){
-                        $sgdd[] = $temp;
-                    }
-
                     $risk_index = 0;
+                    $line['index'] = $index_1;
+                    $line['wwdw_num'] = $wwdw_num;
                     $line['coal_washery'] = $value->title;
                     $line['work_place_num'] = $v->sgdsl;
                     $line['wwdw'] = $v->wwdw;
@@ -4531,26 +4547,12 @@ class CameraApiController extends BaseController
                     if ($line['di']    > 0) $level_total .= '低风险'.$line['di'].'项';
                     $line['level'] = $level_total;
 
+                    $res['risk_list'][] = $line;
 
 
-                }
 
-
-                $wwdw_num = count($wwdw);
-                $sgdd_num = count($sgdd);
-                $var1 = implode('、',$wwdw);
-                $var2 = implode('、',$sgdd);
-
-                if (++$index_1==1){
-                    $total2 .= '2.'.$index_1.'.'.$value->title.'引进委外单位'.$wwdw_num.'个（'.$var1.')，'.'，作业厂点'.$sgdd_num.'个（'.$var2.'）；\n';
-                } else{
-                    $total2 .= '  '.$index_1.'.'.$value->title.'引进委外单位'.$wwdw_num.'个（'.$var1.')，'.'，作业厂点'.$sgdd_num.'个（'.$var2.'）；\n';
                 }
 
-                $line['index'] = $index_1;
-                $line['wwdw_num'] = $wwdw_num;
-                $res['risk_list'][] = $line;
-
             }
         }
 
@@ -4588,9 +4590,9 @@ class CameraApiController extends BaseController
                 }
 
                 if (++$index_2 == 1) {
-                    $total3 .= $index_2.'.'.$value->title.'委外作业'.count($work_place_list_arr).'项，委外施工单位'.count($dd_wwdw).'个，施工点'.$dd_sgdsl.'个；\n';
+                    $total3 .= $index_2.'.'.$value->title.'委外作业'.count($work_place_list_arr).'项，委外施工单位'.count($dd_wwdw).'个，施工点'.$dd_sgdsl."个；\n";
                 }else{
-                    $total3 .= '    '.$index_2.'.'.$value->title.'委外作业'.count($work_place_list_arr).'项，委外施工单位'.count($dd_wwdw).'个，施工点'.$dd_sgdsl.'个；\n';
+                    $total3 .= '    '.++$index_2.'.'.$value->title.'委外作业'.count($work_place_list_arr).'项，委外施工单位'.count($dd_wwdw).'个，施工点'.$dd_sgdsl."个；\n";
                 }