fix:export2Type

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

@@ -3352,12 +3352,12 @@ class CameraApiController extends BaseController
         }
 
         $risk_list = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment as risk')
-            ->select('risk.risk_type','risk.risk_level','risk.risk_name','risk.work_num','risk.risk_location','risk.work_people','coal.title as coal_title','area.title as area_title','area.id as area_id')
+            ->select('risk.risk_type','risk.risk_level','risk.risk_name','risk.work_num','risk.risk_location','risk.work_people','risk.move_camera','coal.title as coal_title','area.title as area_title','area.id as area_id')
             ->leftJoin('uf_xx_coal_washery as coal','coal.id','=','risk.coal_washery_id')
             ->leftJoin('uf_xx_area as area','area.id','=','coal.area_id')
             ->where('risk.is_delete',0)
             ->where('risk.delete_type',0)
-            ->whereDate('risk.create_time', $date)
+            ->whereDate('risk.fill_time', $date)
             // ->whereIn('risk.risk_level',[0,1])
             ->where('risk.current_step','结束节点')
             ->whereNotNull('risk.flow_id')
@@ -3388,7 +3388,7 @@ class CameraApiController extends BaseController
                                 'risk_type'=>$risk_type[$i],
                                 'risk_level'=>$risk_list[$j]->risk_level,
                                 'unit'=>$risk_list[$j]->coal_title,
-                                'content'=>$risk_list[$j]->risk_name,
+                                'content'=>$risk_list[$j]->risk_name ."[". $risk_list[$j]->move_camera."]",
                                 'people_count'=>$risk_list[$j]->work_num,
                                 'work_location'=>$risk_list[$j]->risk_location,
                                 'leader'=>$risk_list[$j]->work_people
@@ -3472,18 +3472,14 @@ class CameraApiController extends BaseController
             $mark = $params['mark'];
             if ($mark === 0){
                 foreach ($type_list as $item) {
-                    // 检查"area"键的值是否为"第一个"
                     if ($item["area"] === "宁东片区") {
-                        // 将符合条件的元素添加到$result_list中
                         $result_list[] = $item;
                     }
                 }
                 $result['type_list'] = $result_list;
             }elseif ($mark === 1){
                 foreach ($type_list as $item) {
-                    // 检查"area"键的值是否为"第一个"
                     if ($item["area"] === "太西片区") {
-                        // 将符合条件的元素添加到$result_list中
                         $result_list[] = $item;
                     }
                 }