人事导出无进场时间修改

app/LaborReport.php

@@ -202,11 +202,9 @@ class LaborReport extends Model
     //进场时间
     public function getEnterAtAttribute()
     {
-        if ($this['userDutyCheck']&&$this['userDutyCheck']['type']=='登入')
-        return $this['userDutyCheck']?$this['userDutyCheck']['checked_at']:null;
-//        $laborReportStatus=LaborReportStatus::where('labor_report_id',$this['id'])->where('status','未审核')->orderBy('id','desc')->first();
-//        if (empty($laborReportStatus))return null;
-//        return Carbon::parse($laborReportStatus['created_at'])->format('Y-m-d H:i:s');
+        $laborReportStatus=LaborReportStatus::where('labor_report_id',$this['id'])->where('status','未审核')->orderBy('id','desc')->first();
+        if (empty($laborReportStatus))return null;
+        return Carbon::parse($laborReportStatus['created_at'])->format('Y-m-d H:i:s');
     }
 
     public function getEnteringRecordAttribute()
@@ -221,11 +219,9 @@ class LaborReport extends Model
 
     public function getExitAtAttribute()
     {
-        if ($this['userDutyCheck']&&$this['userDutyCheck']['type']=='登出')
-            return $this['userDutyCheck']?$this['userDutyCheck']['checked_at']:null;
-//        $laborReportStatus=LaborReportStatus::where('labor_report_id',$this['id'])->where('status','已退场')->orderBy('id','desc')->first();
-//        if (empty($laborReportStatus))return null;
-//        return Carbon::parse($laborReportStatus['created_at'])->format('Y-m-d H:i:s');
+        $laborReportStatus=LaborReportStatus::where('labor_report_id',$this['id'])->where('status','已退场')->orderBy('id','desc')->first();
+        if (empty($laborReportStatus))return null;
+        return Carbon::parse($laborReportStatus['created_at'])->format('Y-m-d H:i:s');
     }
 
     //创建或获取进场编号

app/UserDutyCheck.php

@@ -28,7 +28,7 @@ class UserDutyCheck extends Model
         return $this->belongsTo('App\UserWorkgroup','workgroup_id','id');
     }
     public function laborReport(){
-        return $this->hasOne('App\LaborReport');
+        return $this->belongsTo('App\LaborReport');
     }
 
     public function laborEnterCheck(){