fix:export62

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

@@ -4842,7 +4842,7 @@ class CameraApiController extends BaseController
             }
 
             // 煤矿风险列表
-//            $coal_washery_risk_list[$coal_washery_id][] = $value;
+            $pre_day_coal_washery_risk_list[$coal_washery_id][] = $value;
         }
 
         $preWwdwNum = count($preWwdw);
@@ -4888,9 +4888,8 @@ class CameraApiController extends BaseController
                     if(!in_array($v->wwdw,$wwdw)){
                         $wwdw[] = $v->wwdw;
                     }
-                    $temp = $coal_washery_dict[$v->sgdd]->title;
-                    if (!in_array($temp,$sgdd)){
-                        $sgdd[] = $temp;
+                    if (!in_array($v->sgdd,$sgdd)){
+                        $sgdd[] = $v->sgdd;
                     }
                     $zyrs += $v->work_num;
                     if ($v->risk_level == 0){
@@ -4910,11 +4909,44 @@ class CameraApiController extends BaseController
 
                 $wwdw_num = count($wwdw);
                 $sgdd_num = count($sgdd);
-                $var1 = implode('、',$wwdw);
-                $var2 = implode('、',$sgdd);
 
-//                $total2 .= ++$index_1.'.'.$value->title.'引进委外单位'.$wwdw_num.'个（'.$var1.')，'.'作业单位'.$sgdd_num.'个（'.$var2."），作业人数：".$zyrs."人。\n";
-                $total2 .= ++$index_1.'.'.$value->title.'引进委外单位'.$wwdw_num.'个，作业单位'.$sgdd_num.'个，作业人数：'.$zyrs."人。\n";
+                /**
+                 * 以下代码是对前一天的对应洗煤厂的统计
+                 *
+                 */
+                // 如果当前洗煤厂前一天有数据则拿出来统计没有相关的数据为零
+                $pre_wwdw = [];
+                $pre_sgdd = [];
+                $pre_zyrs =  0;
+
+                if (isset($pre_day_coal_washery_risk_list[$id])) {
+
+                    // 拿出当前id煤矿的所有风险
+                    $pre_coal_washery_risk_info_arr = $pre_day_coal_washery_risk_list[$id];
+
+
+                    foreach ($pre_coal_washery_risk_info_arr as $k => $v) {
+                        if(!in_array($v->wwdw,$pre_wwdw)){
+                            $pre_wwdw[] = $v->wwdw;
+                        }
+                        if (!in_array($v->sgdd,$pre_sgdd)){
+                            $pre_sgdd[] = $v->sgdd;
+                        }
+                        $pre_zyrs += $v->work_num;
+                    }
+
+                }
+                $pre_wwdw_num = count($pre_wwdw);
+                $pre_sgdd_num = count($pre_sgdd);
+
+                // 委外单位差值
+                $preVar7 = sprintf("%+d",$wwdw_num - $pre_wwdw_num);
+                // 作业单位差值
+                $preVar8 = sprintf("%+d",$sgdd_num - $pre_sgdd_num);
+                // 作业人数差值
+                $preVar9 = sprintf("%+d",$zyrs - $pre_wwdw_num);
+
+                $total2 .= ++$index_1.'.'.$value->title.'引进委外单位'.$wwdw_num.'个（'.$preVar7.'），作业单位'.$sgdd_num.'个（'.$preVar8.'），作业人数：'.$zyrs."人（'.$preVar9.'）。\n";
 
 
                 $line = [
@@ -4962,33 +4994,6 @@ class CameraApiController extends BaseController
                         $line['fxlx'] = '未知';
                     }
 
-//                    $risk_info = '';
-//                    if ($v->risk_level == 0) {
-//                        $line['gao'] = 1;
-//                        $line['zhong'] = '';
-//                        $line['di'] = '';
-//                        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['gao'] = '';
-//                        $line['zhong'] = 1;
-//                        $line['di'] = '';
-//                        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['gao'] = '';
-//                        $line['zhong'] = '';
-//                        $line['di'] = 1;
-//                    }
-
-//                    $line['content'] = $v->risk_name.$risk_info."盯控人：".$v->work_people;
-
                     $res['risk_list'][] = $line;