cqp 1 일 전
부모
커밋
18fff66847
1개의 변경된 파일3개의 추가작업 그리고 2개의 파일을 삭제
  1. 3 2
      app/Service/LargeScreenService.php

+ 3 - 2
app/Service/LargeScreenService.php

@@ -895,7 +895,7 @@ class LargeScreenService extends Service
             ->where('a.del_time',0)
             ->where('a.type',DeviceOrder::Model_type_three)
 //            ->whereIn('equipment_id',[8,9,12,13])
-            ->select('a.state','a.equipment_id as device_id','a.dxj_id','b.crt_id')
+            ->select('a.state','a.equipment_id as device_id','a.dxj_id','b.crt_id','b.mark')
             ->orderby('a.id', 'desc')
             ->get()->toArray();
         $emp_map = Employee::whereIn('id',array_column($list_2,'crt_id'))
@@ -903,7 +903,8 @@ class LargeScreenService extends Service
             ->toArray();
         foreach ($list_2 as $key => $value) {
             $list_2[$key]['device_name'] = $e_map2[$value['device_id']] ?? "";
-            $list_2[$key]['dxj_name'] = $d_map[$value['dxj_id']] ?? "";
+//            $list_2[$key]['dxj_name'] = $d_map[$value['dxj_id']] ?? "";
+            $list_2[$key]['dxj_name'] = $value['mark'];
             $list_2[$key]['state_title'] = DeviceOrderInfo::$prefix_2[$value['state']] ?? "";
             $list_2[$key]['crt_name'] = $emp_map[$value['crt_id']] ?? "";
         }