Forráskód Böngészése

全流程巡检接口修改

任敬轩 1 hónapja
szülő
commit
a31357edbd
1 módosított fájl, 24 hozzáadás és 12 törlés
  1. 24 12
      Modules/Admin/Services/ApiService.php

+ 24 - 12
Modules/Admin/Services/ApiService.php

@@ -248,23 +248,35 @@ class ApiService{
     //网格化巡检记录查询条件
     public static function getResultConition()
     {
+//        $result['status'] = true;
+//        $result['msg']    = ApiEnum::RETURN_SUCCESS;
+//        $result['data']   = [];
+//
+//        $depart = DB::connection('mysql_fwe10_eteams')->table('department')
+//            ->where('parent', '100001980000000049')
+//            ->where('name', 'like', '%' . '洗煤厂')
+//            ->where('id','!=','100001590000001602')
+//            ->get();
+//
+//        $depart_arr = [];
+//        foreach ($depart as $key => $val) {
+//            $depart_name = str_replace('洗选中心', '', $val->fullname);
+//            $depart_arr[$key] = $depart_name;
+//        }
+//
+//        $result['data'] = $depart_arr;
+//
+//        return $result;
+
         $result['status'] = true;
         $result['msg']    = ApiEnum::RETURN_SUCCESS;
         $result['data']   = [];
 
-        $depart = DB::connection('mysql_fwe10_eteams')->table('department')
-            ->where('parent', '100001980000000049')
-            ->where('name', 'like', '%' . '洗煤厂')
-            ->where('id','!=','100001590000001602')
-            ->get();
-
-        $depart_arr = [];
-        foreach ($depart as $key => $val) {
-            $depart_name = str_replace('洗选中心', '', $val->fullname);
-            $depart_arr[$key] = $depart_name;
-        }
+        $area_list = DB::connection('mysql_fwe10')->table('uf_zhxx_qlcqyzd')->pluck('szxmc')->toArray();
+        $area_list = array_unique($area_list);
+        $area_list = array_values($area_list);
 
-        $result['data'] = $depart_arr;
+        $result['data'] = $area_list;
 
         return $result;
     }