소스 검색

全流程巡检接口修改

任敬轩 1 개월 전
부모
커밋
c264df6d8c
1개의 변경된 파일11개의 추가작업 그리고 9개의 파일을 삭제
  1. 11 9
      Modules/Admin/Services/ApiService.php

+ 11 - 9
Modules/Admin/Services/ApiService.php

@@ -157,22 +157,24 @@ class ApiService{
             $date = date('Y-m-d', time());
         }
 
-        $depart = DB::connection('mysql_fwe10_eteams')->table('department')
-            ->where('parent', '100001980000000049')
-            ->where('name', 'like', '%' . '洗煤厂')
-            ->where('id','!=','100001590000001602')
-            ->get();
+        // $depart = DB::connection('mysql_fwe10_eteams')->table('department')
+        //     ->where('parent', '100001980000000049')
+        //     ->where('name', 'like', '%' . '洗煤厂')
+        //     ->where('id','!=','100001590000001602')
+        //     ->get();
+
+        $depart = DB::connection('mysql_fwe10')->table('uf_zhxx_qlcqyzd')->pluck('szxmc')->toArray();
+        $depart = array_unique($depart);
+        $depart = array_values($depart);
 
         $depart_arr = [];
         foreach ($depart as $key => $val) {
-            $depart_name = str_replace('洗选中心', '', $val->fullname);
             $depart_arr[$key] = [
-                'name' => $depart_name,
-
+                'name' => $val
             ];
 
             $query = DB::connection('mysql_fwe10')->table('uf_zhxx_qlcxjjl')
-                ->where('xjdw', $depart_name)
+                ->where('xjdw', $val)
                 ->where('lrsj', 'like', '%' . $date . '%')
                 ->groupBy('lrr')->select(
                     [