فهرست منبع

fix:总表导出外委的相关信息需要换行

Xu·LinPeng 5 ماه پیش
والد
کامیت
06cd95af48
1فایلهای تغییر یافته به همراه75 افزوده شده و 17 حذف شده
  1. 75 17
      Modules/Camera/Http/Controllers/Api/CameraApiController.php

+ 75 - 17
Modules/Camera/Http/Controllers/Api/CameraApiController.php

@@ -3142,30 +3142,88 @@ class CameraApiController extends BaseController
                 $reviewer = [];//审核人
                 $coal_washery_risk_info_arr = $coal_washery_risk_list[$id];
 
+                // 如果修改后的代码可以正常运行一段时间,以下注释的代码都可以删除,修改时间2025/1/9
                 $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].')';
+                if (isset($coal_washery_type_dict[$id])) {
+                    $coal_washery_type = $coal_washery_type_dict[$id];
+                    if ($coal_washery_type == 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.";";
+
+                            $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);
+                        }
+//                        $line['index'] = ++ $index_ziying;
+//                        $res["ziying_list"][] = $line;
                     } else {
-                        $di++;
-                    }
+                        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";
+                            $content .= ++$risk_index.".".$v->risk_name.$risk_info.";\n";
 
-                    $place .= $risk_index.".".$v->risk_location.";";
-                    $leader .= $risk_index.".".$v->work_people.";";
+                            $place .= $risk_index.".".$v->risk_location.";\n";
+                            $leader .= $risk_index.".".$v->work_people.";\n";
 
-                    if (isset($v->shr) && !empty($v->shr)) {
-                        $reviewer[] = $v->shr;
+                            if (isset($v->shr) && !empty($v->shr)) {
+                                $reviewer[] = $v->shr;
+                            }
+                            $reviewer = array_unique($reviewer);
+                        }
+//                        $line['index'] = ++ $index_waiwei;
+//                        $res["waiwei_list"][] = $line;
                     }
-                    $reviewer = array_unique($reviewer);
                 }
+//                $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.'项 ';