perf:export6

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

@@ -4295,7 +4295,6 @@ class CameraApiController extends BaseController
 
     // 导出委外作业
     public function export6(Request $request){
-//        $params = $request->all();
 
         $date = $request->query('date', date('Y-m-d'));
         $coal_washery_id = $request->query('coal_washery_id');
@@ -4319,31 +4318,6 @@ class CameraApiController extends BaseController
             $risk_type_dict[$risk_type_key] = $risk_type_name;
         }
 
-//        if(!empty($area_id)){
-//            // 风险数据 is_delete = 0 and delete_type = 0 and flow_id is not null
-//            $risk_list = DB::connection('mysql_fwe10')
-//                ->table('uf_xx_risk_assignment as t')
-//                ->select('t.*','t1.shr as coal_shr')
-//                ->whereDate('t.create_time', $date)
-//                ->where('t.is_delete',0)
-//                ->where('t.delete_type',0)
-//                ->whereNotNull('t.wwdw')
-//                ->whereNotNull('t.sgdd')
-//                ->where('t.current_step','结束节点')
-//                ->whereNotNull('t.flow_id');
-//        }else{
-//            // 风险数据 is_delete = 0 and delete_type = 0 and flow_id is not null
-//            $risk_list = DB::connection('mysql_fwe10')
-//                ->table('uf_xx_risk_assignment as t')
-//                ->whereDate('t.create_time', $date)
-//                ->where('t.is_delete',0)
-//                ->where('t.delete_type',0)
-//                ->whereNotNull('t.wwdw')
-//                ->whereNotNull('t.sgdd')
-//                ->where('t.current_step','结束节点')
-//                ->whereNotNull('t.flow_id');
-//        }
-
         $risk_list = DB::connection('mysql_fwe10')
             ->table('uf_xx_risk_assignment as t')
             ->whereDate('t.create_time', $date)
@@ -4467,14 +4441,11 @@ class CameraApiController extends BaseController
 
         $res['num'] = count($risk_list);
 
-        $coal_list = [];
-        $index = 0;
         $index_ziying = 0;
         $index_waiwei = 0;
         foreach ($coal_washery_dict as $key => $value) {
             $id = $value->ID;
             if (isset($coal_washery_risk_list[$id])) {
-                $index++;
                 $people = 0;//计划人数
                 $gao = 0;
                 $zhong = 0;
@@ -4490,107 +4461,64 @@ class CameraApiController extends BaseController
                 $risk_index = 0;
                 if (isset($coal_washery_type_dict[$id])) {
                     $coal_washery_type = $coal_washery_type_dict[$id];
-                    // 以下的if分支 无论是自营还是委外，处理的逻辑和步骤都是一样的，所以可以优化掉分支结构
-                    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++;
-                                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){
-                                    $risk_info = '('.$risk_desc[$v->risk_level].'，'.$risk_type_dict[$v->risk_type].')';
-                                }else{
-                                    $risk_info = '('.$risk_desc[$v->risk_level].')';
-                                }
-                            } else {
-                                $di++;
+                    foreach ($coal_washery_risk_info_arr as $k => $v) {
+                        $people += $v->work_num;
+                        $risk_info = '';
+                        if ($v->risk_level == 0) {
+                            $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].')';
                             }
-
-                            $content .= ++$risk_index.".".$v->risk_name.$risk_info."；\n";
-
-
-                            $place .= $risk_index.".".$v->risk_location."；\n";
-                            $leader .= $risk_index.".".$v->work_people."；\n";
-
-                            if (isset($v->shr) && !empty($v->shr)) {
-                                $reviewer[] = $v->shr;
+                        } 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].')';
                             }
-                            $reviewer = array_unique($reviewer);
+                        } else {
+                            $di++;
                         }
-//                        $line['index'] = ++ $index_ziying;
-//                        $res["ziying_list"][] = $line;
-                    } else {
-                        foreach ($coal_washery_risk_info_arr as $k => $v) {
-                            $people += $v->work_num;
-                            $risk_info = '';
-                            if ($v->risk_level == 0) {
-                                $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 {
-                                $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."；\n";
-                            $leader .= $risk_index.".".$v->work_people."；\n";
 
-                            if (isset($v->shr) && !empty($v->shr)) {
-                                $reviewer[] = $v->shr;
-                            }
-                            $reviewer = array_unique($reviewer);
+                        $place .= $risk_index.".".$v->risk_location."；\n";
+                        $leader .= $risk_index.".".$v->work_people."；\n";
+
+                        if (isset($v->shr) && !empty($v->shr)) {
+                            $reviewer[] = $v->shr;
                         }
+                        $reviewer = array_unique($reviewer);
                     }
-                }
-                $level_total = '';
-                if ($gao   > 0) $level_total .= '高风险'.$gao."项\n";
-                if ($zhong > 0) $level_total .= '中风险'.$zhong."项\n";
-                if ($di    > 0) $level_total .= '低风险'.$di.'项';
-                /**
-                 * 在下文中的￥line中，'unit' 、'classes' 和 'risk_dexcribe' 中的 $v 可能未定义
-                 * （如果能取到值应该是上文定义的 $v 中的遍历的最后一个的对应值）
-                 * 这两个的值是不合理的，但是目前系统中 unit 的值总是 洗选中心，
-                 * classes 和 risk_dexcribe 的值的准确性也没有要求
-                 */
-                $line = [
-                    'index' => $index,
-                    'unit' => $v->unit,
-                    'coal_washery' => $value->title,
-                    'classes' => $classes[$v->classes],
-                    'work_num' => $people,
-                    'level' => $level_total,
-                    'content' => $content,
-                    'place' => $place,
-                    'leader' => $leader,
-                    'risk_dexcribe' => $risk_describe_dict[$v->risk_describe],
-                    'reviewer' => implode(',', $reviewer),
-                    'id' => $value->ID,
-                ];
-//                $coal_list[] = $line;
 
-                // 自营、外委
-                if (isset($coal_washery_type_dict[$id])) {
-                    $coal_washery_type = $coal_washery_type_dict[$id];
+                    $level_total = '';
+                    if ($gao   > 0) $level_total .= '高风险'.$gao."项\n";
+                    if ($zhong > 0) $level_total .= '中风险'.$zhong."项\n";
+                    if ($di    > 0) $level_total .= '低风险'.$di.'项';
+                    /**
+                     * 在下文中的￥line中，'unit' 、'classes' 和 'risk_dexcribe' 中的 $v 可能未定义
+                     * （如果能取到值应该是上文定义的 $v 中的遍历的最后一个的对应值）
+                     * 这两个的值是不合理的，但是目前系统中 unit 的值总是 洗选中心，
+                     * classes 和 risk_dexcribe 的值的准确性也没有要求
+                     */
+                    $line = [
+//                        'index' => $index,
+                        'unit' => $v->unit,
+                        'coal_washery' => $value->title,
+                        'classes' => $classes[$v->classes],
+                        'work_num' => $people,
+                        'level' => $level_total,
+                        'content' => $content,
+                        'place' => $place,
+                        'leader' => $leader,
+                        'risk_dexcribe' => $risk_describe_dict[$v->risk_describe],
+                        'reviewer' => implode(',', $reviewer),
+                        'id' => $value->ID,
+                    ];
+
                     if ($coal_washery_type == 0) {
                         $line['index'] = ++ $index_ziying;
                         $res["ziying_list"][] = $line;
@@ -4598,14 +4526,10 @@ class CameraApiController extends BaseController
                         $line['index'] = ++ $index_waiwei;
                         $res["waiwei_list"][] = $line;
                     }
+
                 }
             }
         }
-//        $res['table_list'] = $coal_list;
-//        foreach($res["ziying_list"] as $key => $value){
-//            $content = substr($value["content"], 0, -3);
-//            $res["ziying_list"][$key]["content"] =$content;
-//        }
         $ziying_people = 0;
         $waiwei_people = 0;
         for ($i = 0; $i < count($res["ziying_list"]); $i++) {