全流程巡检接口

Modules/Admin/Services/ApiService.php

@@ -206,14 +206,15 @@ class ApiService{
         $result['msg']    = ApiEnum::RETURN_SUCCESS;
         $result['data']   = [];
 
-        $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] = $depart_name;
         }
 
@@ -445,7 +446,7 @@ class ApiService{
         $result['msg']    = ApiEnum::RETURN_SUCCESS;
         $result['data']   = [];
 
-        $query = DB::connection('mysql_fwview')->table('uf_wghgl_new');
+        $query = DB::connection('mysql_fwe10')->table('uf_zhxx_qlcxjjl');
 
         if ($start_date == $end_date) {
             $query = $query->where('lrsj', 'like', $start_date . '%');
@@ -458,54 +459,38 @@ class ApiService{
         }
 
         if ($person) {
-            $person_id = DB::connection('mysql_fwview')->table('hrmresource')
-                           ->where('lastname', 'like', '%' . $person . '%')->pluck('id')->all();
-            $query = $query->whereIn('lrr', $person_id);
+            // $person_id = DB::connection('mysql_fwview')->table('hrmresource')
+            //   ->where('lastname', 'like', '%' . $person . '%')->pluck('id')->all();1
+            $query = $query->whereIn('lrr', 'like','%'.$person_id.'%');
         }
 
-        $query = $query->orderBy('lrdate', 'desc')->groupBy('lrdate', 'xjdw', 'lrr')
-                       ->select(
-                           [
-                               DB::raw('DATE(lrsj) as lrdate'),
-                               'xjdw',
-                               'lrr'
-                           ]
-                       )
-                       ->get();
+        $query = $query->orderBy('lrdate', 'desc')->groupBy('lrsj', 'xjdw', 'lrr','jcwt')
+            ->select(
+                [
+                    DB::raw('DATE(lrsj) as lrdate'),
+                    'xjdw',
+                    'lrr',
+                    'jcwt'
+                ]
+            )
+            ->get();
 
         $data = [];
         foreach ($query as $key => $val) {
-            $lastname = DB::connection('mysql_fwview')->table('hrmresource')
-                          ->where('id', $val->lrr)->value('lastname');
-            $allcount = DB::connection('mysql_fwview')->table('formtable_main_974')
-                          ->where('szxmc', $val->xjdw)->count();
-
-            $detail = DB::connection('mysql_fwview')->table('uf_wghgl_new')
-                        ->where('xjdw', $val->xjdw)
-                        ->where(DB::raw('DATE(lrsj)'), $val->lrdate)
-                        ->where('lrr', $val->lrr)->count();
-
-            if ($allcount <= 0) {
-                continue;
+            $lastname = explode('|',$val->lrr)[0];
+            if($val->jcwt == '有'){
+                $is_complete = 0;
+            }else{
+                $is_complete = 1;
             }
+            $data[] = [
+                'depart'      => $val->xjdw,
+                'lastname'    => $lastname,
+                'person_id'   => $val->lrr,
+                'date'        => $val->lrdate,
+                'is_complete' => $is_complete
+            ];
 
-            if ($detail >= $allcount) {
-                $data[] = [
-                    'depart'      => $val->xjdw,
-                    'lastname'    => $lastname,
-                    'person_id'   => $val->lrr,
-                    'date'        => $val->lrdate,
-                    'is_complete' => 1
-                ];
-            } else {
-                $data[] = [
-                    'depart'      => $val->xjdw,
-                    'lastname'    => $lastname,
-                    'person_id'   => $val->lrr,
-                    'date'        => $val->lrdate,
-                    'is_complete' => 0
-                ];
-            }
         }
 
         $result['data'] = $data;