fix:export62

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

@@ -5018,6 +5018,15 @@ class CameraApiController extends BaseController
 
         }
 
+        $pre_work_place_list=[];
+        foreach ($risk_list_previousDay as $key1=>$v1) {
+            // 获取施工地点id
+            $pre_work_place = $v1->sgdd;
+            // 施工地点列表
+            $pre_work_place_list[$pre_work_place][] = $v1;
+
+        }
+
         $uniqueKeys = array_keys($work_place_list);
         $count1 = count($uniqueKeys);
         $var3 = (int) ($count1 / 2);
@@ -5027,28 +5036,43 @@ class CameraApiController extends BaseController
         $total4 = '';
         $index_2 = 0;
         foreach ($coal_washery_dict as $key=>$value) {
-            $dd_wwdw = [];
-            $dd_sgdsl = 0;
-            $workNumber = 0;
+
             $id = $value->ID;
 
             if (isset($work_place_list[$id])) {
 
+                $workNumber = 0;
+                $riskWorkNum = 0;
+
                 // 拿出当前施工地点的所有风险
                 $work_place_list_arr = $work_place_list[$id];
                 foreach ($work_place_list_arr as $k => $v) {
-                    if (!in_array($v->wwdw,$dd_wwdw)) {
-                        $dd_wwdw[] = $v->wwdw;
-                    }
-                    $dd_sgdsl += $v->sgdsl;
                     $workNumber += $v->work_num;
                 }
+                $riskWorkNum = count($work_place_list_arr);
+
+
+                $preWorkNumber = 0;
+                $preRiskWorkNum = 0;
+                if (isset($pre_work_place_list[$id])) {
+
+                    // 拿出当前施工地点的所有风险
+                    $pre_work_place_list_arr = $pre_work_place_list[$id];
+                    foreach ($work_place_list_arr as $k => $v) {
+                        $preWorkNumber += $v->work_num;
+                    }
+                    $preRiskWorkNum = count($pre_work_place_list_arr);
+                }
+
+                // 委外作业项差值
+                $preVar10 = sprintf("%+d",$riskWorkNum - $preRiskWorkNum);
+                // 作业人数差值
+                $preVar11 = sprintf("%+d",$workNumber - $preWorkNumber);
 
-//                $total3 .= ++$index_2.'.'.$value->title.'委外作业'.count($work_place_list_arr).'项，委外施工单位'.count($dd_wwdw).'个，施工点'.$dd_sgdsl."个；\n";
                 if (++$index_2<=$var3){
-                    $total3 .= $index_2.'.'.$value->title.'委外作业'.count($work_place_list_arr).'项，作业人数：'.$workNumber."人；\n";
+                    $total3 .= $index_2.'.'.$value->title.'委外作业'.$riskWorkNum.'项（'.$preVar10.'），作业人数：'.$workNumber."人（".$preVar11."）；\n";
                 } else{
-                    $total4 .= $index_2.'.'.$value->title.'委外作业'.count($work_place_list_arr).'项，作业人数：'.$workNumber."人；\n";
+                    $total4 .= $index_2.'.'.$value->title.'委外作业'.$riskWorkNum.'项（'.$preVar10.'），作业人数：'.$workNumber."人（".$preVar11."）；\n";
                 }