fix:export6

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

@@ -4363,10 +4363,10 @@ class CameraApiController extends BaseController
         // 存放每个洗煤厂的信息
         $coal_washery_dict = [];
         // 存放每个洗煤厂是自营还是外委的信息，0 自营，1 外委
-        $coal_washery_type_dict = [];
+//        $coal_washery_type_dict = [];
         foreach ($coal_washery_list as $key=>$value) {
             $coal_washery_dict[$value->ID] = $value;
-            $coal_washery_type_dict[$value->ID] = $value->obj_type;
+//            $coal_washery_type_dict[$value->ID] = $value->obj_type;
         }
 
         $res = [
@@ -4471,34 +4471,6 @@ class CameraApiController extends BaseController
                 $wwdw = [];
                 $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' => '',
@@ -4514,53 +4486,72 @@ class CameraApiController extends BaseController
                     'place' => '',
                 ];
 
+                foreach ($coal_washery_risk_info_arr as $k => $v) {
 
-                if (isset($coal_washery_type_dict[$id])) {
+                    if(!in_array($v->wwdw,$wwdw)){
+                        $wwdw[] = $v->wwdw;
+                    }
+                    $temp = $coal_washery_dict[$v->sgdd]->title;
+                    if (!in_array($temp,$sgdd)){
+                        $sgdd[] = $temp;
+                    }
 
-                    foreach ($coal_washery_risk_info_arr as $k => $v) {
-                        $risk_index = 0;
-                        $line['index'] = $index_1;
-                        $line['coal_washery'] = $v->title;
-                        $line['work_place_num'] = $v->sgdsl;
-                        $line['wwdw'] = $v->wwdw;
-                        $line['wwdw_num'] = $wwdw_num;
-                        $line['place'] = $coal_washery_dict[$v->sgdd]->title;
 
+                    $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';
+                    }
 
-                        $risk_info = '';
-                        if ($v->risk_level == 0) {
-                            $line['gao'] = 1;
-                            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) {
-                            $line['zhong'] = 1;
-                            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 {
-                            $line['di'] = 1;
-                        }
 
-                        $line['content'] .= ++$risk_index.".".$v->risk_name.$risk_info."盯控人：".$v->work_people;
 
-                        $level_total = '';
-                        if ($line['gao']   > 0) $level_total .= '高风险'.$line['gao']."项\n";
-                        if ($line['zhong'] > 0) $level_total .= '中风险'.$line['zhong']."项\n";
-                        if ($line['di']    > 0) $level_total .= '低风险'.$line['di'].'项';
-                        $line['level'] = $level_total;
 
-                        $res['risk_list'][] = $line;
+                    $risk_index = 0;
+                    $line['index'] = $index_1;
+                    $line['coal_washery'] = $v->title;
+                    $line['work_place_num'] = $v->sgdsl;
+                    $line['wwdw'] = $v->wwdw;
+                    $line['wwdw_num'] = $wwdw_num;
+                    $line['place'] = $coal_washery_dict[$v->sgdd]->title;
 
+
+
+                    $risk_info = '';
+                    if ($v->risk_level == 0) {
+                        $line['gao'] = 1;
+                        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) {
+                        $line['zhong'] = 1;
+                        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 {
+                        $line['di'] = 1;
                     }
 
+                    $line['content'] .= ++$risk_index.".".$v->risk_name.$risk_info."盯控人：".$v->work_people;
+
+                    $level_total = '';
+                    if ($line['gao']   > 0) $level_total .= '高风险'.$line['gao']."项\n";
+                    if ($line['zhong'] > 0) $level_total .= '中风险'.$line['zhong']."项\n";
+                    if ($line['di']    > 0) $level_total .= '低风险'.$line['di'].'项';
+                    $line['level'] = $level_total;
+
+                    $res['risk_list'][] = $line;
 
                 }
+
             }
         }