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

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

@@ -3033,7 +3033,7 @@ class CameraApiController extends BaseController
 
         $classes = ['早班','中班','夜班'];
         $risk_desc = ['高风险','中风险','低风险'];
-        $risk_describe_dict = [0=>"设备日常维护", 1=>"停产检修", 2=>"大中修", 3=>"计划性检修", 4=>"委外施工"];
+        $risk_describe_dict = [0=>"设备日常检修、维护", 1=>"停产检修", 2=>"大中修", 3=>"计划性检修", 4=>"委外施工"];
         // 风险类型
         $risk_type = DB::connection('mysql_fwe10')
             ->table('field_option as t')
@@ -3197,10 +3197,10 @@ class CameraApiController extends BaseController
                                 $di++;
                             }
 
-                            $content .= ++$risk_index.".".$v->risk_name.$risk_info."；";
+                            $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;
@@ -3295,6 +3295,36 @@ class CameraApiController extends BaseController
             }
         }
 //        $res['table_list'] = $coal_list;
+//        foreach($res["ziying_list"] as $key => $value){
+//            $content = substr($value["content"], 0, -3);
+//            $res["ziying_list"][$key]["content"] =$content;
+//        }
+        for ($i = 0; $i < count($res["ziying_list"]); $i++) {
+            $content = $res["ziying_list"][$i]['content'];
+//            $content = substr($content, 0, -1);
+            $content = "\n".$content;
+            $res["ziying_list"][$i]['content'] = $content;
+            $place = $res["ziying_list"][$i]['place'];
+            $place = substr($place, 0, -1);
+            $res["ziying_list"][$i]['place'] = $place;
+            $leader = $res["ziying_list"][$i]['leader'];
+            $leader = substr($leader, 0, -1);
+            $res["ziying_list"][$i]['leader'] = $leader;
+
+        }
+        for ($i = 0; $i < count($res["waiwei_list"]); $i++) {
+            $content = $res["waiwei_list"][$i]['content'];
+//            $content = substr($content, 0, -1);
+            $content = "\n".$content;
+            $res["waiwei_list"][$i]['content'] = $content;
+            $place = $res["waiwei_list"][$i]['place'];
+            $place = substr($place, 0, -1);
+            $res["waiwei_list"][$i]['place'] = $place;
+            $leader = $res["waiwei_list"][$i]['leader'];
+            $leader = substr($leader, 0, -1);
+            $res["waiwei_list"][$i]['leader'] = $leader;
+
+        }
 
         if ($res['gao'] > 0) {
             $risk_gao_info = '(其中：';
@@ -3349,7 +3379,7 @@ class CameraApiController extends BaseController
             ->leftJoin('uf_xx_area as area','area.id','=','coal.area_id')
             ->where('risk.is_delete',0)
             ->where('risk.delete_type',0)
-            ->whereDate('risk.fill_time', $date)
+            ->whereDate('risk.fill_date', $date)
             // ->whereIn('risk.risk_level',[0,1])
             ->where('risk.current_step','结束节点')
             ->whereNotNull('risk.flow_id')
@@ -3557,7 +3587,8 @@ class CameraApiController extends BaseController
     //导出摄像头表
     public function export2Camera(Request $request){
         $params = $request->all();
-        $result['camera_list'] = [];
+//        $result['camera_list'] = [];
+        $camera_list = [];
         $index = 0;
 
         if(isset($params['date'])){
@@ -3600,7 +3631,7 @@ class CameraApiController extends BaseController
                     $risk = $risk_dict[$value->ID];
                     foreach ($risk as $k => $v) {
                         $index++;
-                        $result['camera_list'][] = [
+                        array_push($camera_list,[
                             'area'=>$value->area_title,
                             'unit'=>$value->title,
                             'index'=>$index,
@@ -3608,13 +3639,47 @@ class CameraApiController extends BaseController
                             'content'=>$v->risk_name,
                             'work_location'=>$v->risk_location,
                             'leader'=>$v->work_people,
-                        ];
+                        ]);
+//                        $result['camera_list'][] = [
+//                            'area'=>$value->area_title,
+//                            'unit'=>$value->title,
+//                            'index'=>$index,
+//                            'people_num'=>$v->work_num,
+//                            'content'=>$v->risk_name,
+//                            'work_location'=>$v->risk_location,
+//                            'leader'=>$v->work_people,
+//                        ];
                     }
                 }
             } catch (Exception $e) {
                 echo $e->getMessage();
             }
         }
+        $result_list = [];
+
+        if(isset($params['mark'])){
+            $mark = $params['mark'];
+            if ($mark == 0){
+                foreach ($camera_list as $item) {
+                    if ($item["area"] == "宁东片区") {
+                        $result_list[] = $item;
+                    }
+                }
+                $result['camera_list'] = $result_list;
+            }elseif ($mark == 1){
+                foreach ($camera_list as $item) {
+                    if ($item["area"] == "太西片区") {
+                        $result_list[] = $item;
+                    }
+                }
+                $result['camera_list'] = $result_list;
+            }else{
+                $result['camera_list'] = $type_list;
+            }
+
+        }else{
+            $result['camera_list'] = $camera_list;
+        }
         return $result;
     }
 
@@ -3633,7 +3698,7 @@ class CameraApiController extends BaseController
             ->select('t.*','t2.title')
             ->leftJoin('uf_xx_coal_washery as t1', 't.coal_washery_id', '=', 't1.id')
             ->leftJoin('uf_xx_area as t2', 't1.area_id', '=', 't2.id')
-            ->whereDate('t.create_time', $date)
+            ->whereDate('t.fill_date', $date)
             ->where('t.is_delete',0)
             ->where('t.wcqk',0)
             ->where('t.is_delete',0)
@@ -3759,7 +3824,7 @@ class CameraApiController extends BaseController
             for($i=0;$i<count($coal_list);$i++){
                 $risk_list = DB::connection('mysql_fwe10')
                     ->table('uf_xx_risk_assignment as t')
-                    ->whereDate('create_time', $date)
+                    ->whereDate('fill_date', $date)
                     ->where('IS_DELETE', 0)
                     ->where('coal_washery_id',$coal_list[$i]->ID)
                     ->where('wcqk',0)
@@ -3848,14 +3913,13 @@ class CameraApiController extends BaseController
             ->where('obj_type',1)
             ->where('t.is_delete',0)
             ->where('t.delete_type',0)
-            ->whereNotNull('t.flow_id')
             ->orderBy('sort')->get();
 
         if(count($coal_list) > 0){
             for($i=0;$i<count($coal_list);$i++){
                 $risk_list = DB::connection('mysql_fwe10')
                     ->table('uf_xx_risk_assignment as t')
-                    ->whereDate('create_time', $date)
+                    ->whereDate('fill_date', $date)
                     ->where('IS_DELETE', 0)
                     ->where('coal_washery_id',$coal_list[$i]->ID)
                     ->where('wcqk',0)