全流程巡检接口

Modules/Admin/Services/ApiService.php

@@ -108,28 +108,37 @@ class ApiService{
             $date = date('Y-m-d', time());
         }
 
-        $depart = DB::connection('mysql_fwview')->table('hrmdepartment')
-                   ->where('subcompanyid1', 49)
-                   ->where('departmentname', 'like', '%' . '洗煤厂')
-                   ->where('id', '!=', 1602)->get();
+        $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->DEPARTMENTNAME);
+            $depart_name = str_replace('洗选中心', '', $val->fullname);
             $depart_arr[$key] = [
                 'name' => $depart_name,
 
             ];
-            $query = DB::connection('mysql_fwview')->table('uf_wghgl_new')
-                       ->join('hrmresource', 'uf_wghgl_new.lrr', '=', 'hrmresource.id')
-                       ->where('xjdw', $depart_name)
-                       ->where('lrsj', 'like', '%' . $date . '%')
-                       ->groupBy('lrr')->select(
-                            [
-                                'hrmresource.lastname as person_name',
-                                'uf_wghgl_new.lrr as person_id'
-                            ]
-                        )->get();
+
+            $query = DB::connection('mysql_fwe10')->table('uf_zhxx_qlcxjjl')
+                ->where('xjdw', $depart_name)
+                ->where('lrsj', 'like', '%' . $date . '%')
+                ->groupBy('lrr')->select(
+                    [
+                        'lrr'
+                    ]
+                )->get();
+
+            if(count($query) > 0){
+                for($i=0;$i<count($query);$i++){
+                    $lrr = explode('|',$query[$i]->lrr);
+                    $query[$i]->person_name = $lrr[0];
+                    $query[$i]->person_id = $lrr[1];
+                }
+            }
+
             $query = json_decode($query);
             $depart_arr[$key]['person_list'] = $query;
         }
@@ -153,25 +162,28 @@ class ApiService{
         $res = [];
         $area_arr = [];
 
-        $query = DB::connection('mysql_fwview')->table('uf_wghgl_new')
-                   ->where('lrr', $person_id)
-                   ->where('lrsj', 'like', '%' . $date . '%')
-                   ->where('xjdw', $depart)
-                   ->orderBy('lrsj', 'asc')->get();
+        $query = DB::connection('mysql_fwe10')->table('uf_zhxx_qlcxjjl')
+            ->where('lrr', $person_id)
+            ->where('lrsj', 'like', '%' . $date . '%')
+            ->where('xjdw', $depart)
+            ->orderBy('lrsj', 'asc')->get();
         $query = json_decode($query);
+
         if ($query) {
             foreach ($query as $key => $val) {
-                $area_arr[] = $val->jcqy;
+                // dd($val);
+                $area_arr[] = $val->xjqy;
                 $res[] = [
-                    'area'    => $val->jcqy,
+                    'area'    => $val->xjqy,
                     'date'    => $val->lrsj,
-                    'data_id' => $val->id,
-                    'url'     => '/mobilemode/formbasebrowserview.jsp?billid=' . $val->id . '&modeId=580&formId=-976',
+                    'data_id' => $val->ID,
+                    'url'     => 'http://anstatic.nxmy.com:8011/assets/html/xixuan/pages/detail.html?id='.$val->ID,
                 ];
             }
-            $area_list = DB::connection('mysql_fwview')->table('formtable_main_974')
-                           ->whereNotIn('qymc', $area_arr)
-                           ->where('szxmc', $depart)->orderBy('areaid', 'asc')->get();
+
+            $area_list = DB::connection('mysql_fwe10')->table('uf_zhxx_qlcqyzd')
+                ->whereNotIn('qymc', $area_arr)
+                ->where('szxmc', $depart)->orderBy('areaid', 'asc')->get();
             foreach ($area_list as $area) {
                 $res[] = [
                     'area'    => $area->qymc,