Merge branch 'master' of http://git.jieweizhineng.com/ushio/video_system into master

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

@@ -3299,6 +3299,8 @@ class CameraApiController extends BaseController
 //            $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++) {
             $content = $res["ziying_list"][$i]['content'];
 //            $content = substr($content, 0, -1);
@@ -3310,6 +3312,7 @@ class CameraApiController extends BaseController
             $leader = $res["ziying_list"][$i]['leader'];
             $leader = substr($leader, 0, -1);
             $res["ziying_list"][$i]['leader'] = $leader;
+            $ziying_people = $ziying_people + $res["ziying_list"][$i]['work_num'];
 
         }
         for ($i = 0; $i < count($res["waiwei_list"]); $i++) {
@@ -3323,8 +3326,15 @@ class CameraApiController extends BaseController
             $leader = $res["waiwei_list"][$i]['leader'];
             $leader = substr($leader, 0, -1);
             $res["waiwei_list"][$i]['leader'] = $leader;
+            $waiwei_people = $waiwei_people + $res["waiwei_list"][$i]['work_num'];
 
         }
+        if ($area_id == 1055262899082551297){
+            $res['people_info'] = "太西片区作业人数：" . ($ziying_people + $waiwei_people) ."人；其中：内部：".$ziying_people."人，外委施工：".$waiwei_people."人";
+        } else{
+            $res['people_info'] = "作业人数：" . ($ziying_people + $waiwei_people) ."人；其中：内部：".$ziying_people."人，外委施工：".$waiwei_people."人";
+        }
+
 
         if ($res['gao'] > 0) {
             $risk_gao_info = '(其中：';