全流程巡检接口

Modules/Admin/Services/ApiService.php

@@ -78,7 +78,7 @@ class ApiService{
 
             'xjqy' => $params['jcqy'],
             'dkpz' => $params['dkpz'],
-            'lrr'  => $params['lrr'].'|'.$params['lrmc'],
+            'lrr'  => $params['lrmc'].'|'.$params['lrr'],
             'jclx' => $params['jclx'],
             'lrsj' => $params['lrsj'],
             'dwmc' => $params['dwmc'],
@@ -362,20 +362,24 @@ class ApiService{
         $result['msg']    = ApiEnum::RETURN_SUCCESS;
         $result['data']   = [];
 
-        $query = DB::connection('mysql_fwview')->table('uf_wghgl_new')
-                   ->join('hrmresource', 'uf_wghgl_new.lrr', '=', 'hrmresource.id')
-                   ->where('lrr', $person_id)
-                   ->where('xjdw', $depart)
-                   ->where('lrsj', 'like', $date . '%')
-                   ->orderBy('lrsj', 'desc')
-                   ->select(
-                       [
-                           'uf_wghgl_new.id',
-                           'lastname',
-                           'jcqy',
-                           'lrsj',
-                       ]
-                   )->get();
+        $query = DB::connection('mysql_fwe10')->table('uf_zhxx_qlcxjjl')
+            ->where('lrr', $person_id)
+            ->where('xjdw', $depart)
+            ->where('lrsj', 'like', $date . '%')
+            ->orderBy('lrsj', 'desc')
+            ->select([
+                'ID',
+                'lrr',
+                'xjqy',
+                'lrsj',
+            ])->get();
+
+        if(count($query) > 0){
+            for($i=0;$i<count($query);$i++){
+                $lrr = explode('|',$query[$i]->lrr);
+                $query[$i]->lrr_name = $lrr[0];
+            }
+        }
 
         $query = json_decode($query);
 
@@ -391,22 +395,29 @@ class ApiService{
         $result['msg']    = ApiEnum::RETURN_SUCCESS;
         $result['data']   = [];
 
-        $query = DB::connection('mysql_fwview')->table('uf_wghgl_new')
-                   ->join('hrmresource', 'uf_wghgl_new.lrr', '=', 'hrmresource.id')
-                   ->where('uf_wghgl_new.id', $id)
-                   ->select(
-                       [
-                           'lastname',
-                           'dwmc',
-                           'xjdw',
-                           'jcqy',
-                           'jclx',
-                           'lrsj',
-                           'jcwt',
-                           'wtms',
-                           'dkpz'
-                       ]
-                   )->get();
+        $query = DB::connection('mysql_fwe10')->table('uf_zhxx_qlcxjjl')
+            ->where('id', $id)
+            ->select(
+                [
+                    'lrr',
+                    'dwmc',
+                    'xjdw',
+                    'xjqy',
+                    'jclx',
+                    'lrsj',
+                    'jcwt',
+                    'wtms',
+                    'dkpz',
+                    'zgzp'
+                ]
+            )->get();
+
+        if(count($query) > 0){
+            for($i=0;$i<count($query);$i++){
+                $lrr = explode('|',$query[$i]->lrr);
+                $query[$i]->lrr_name = $lrr[0];
+            }
+        }
 
         $query = json_decode($query);