人事--页面调整

app/LaborReport.php

@@ -208,7 +208,9 @@ class LaborReport extends Model
     //进场时间
     public function getEnterAtAttribute()
     {
-        $laborReportStatus=LaborReportStatus::where('labor_report_id',$this['id'])->where('status','未审核')->orderBy('id','desc')->first();
+//        $laborReportStatus=LaborReportStatus::where('labor_report_id',$this['id'])->where('status','未审核')->orderBy('id','desc')->first();
+//        if (empty($laborReportStatus))return null;
+        $laborReportStatus=$this->laborReportStatus()->where('status','未审核')->orderBy('id','desc')->first();
         if (empty($laborReportStatus))return null;
         return Carbon::parse($laborReportStatus['created_at'])->format('Y-m-d H:i:s');
     }
@@ -225,7 +227,9 @@ class LaborReport extends Model
 
     public function getExitAtAttribute()
     {
-        $laborReportStatus=LaborReportStatus::where('labor_report_id',$this['id'])->where('status','已退场')->orderBy('id','desc')->first();
+//        $laborReportStatus=LaborReportStatus::where('labor_report_id',$this['id'])->where('status','已退场')->orderBy('id','desc')->first();
+//        if (empty($laborReportStatus))return null;
+        $laborReportStatus=$this->laborReportStatus()->where('status','已退场')->orderBy('id','desc')->first();
         if (empty($laborReportStatus))return null;
         return Carbon::parse($laborReportStatus['created_at'])->format('Y-m-d H:i:s');
     }
@@ -323,120 +327,4 @@ class LaborReport extends Model
         else
             return 0;
     }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-//修改临时工报表审核时间
-//    static function updateLaborReportVerify($laborReport,$userDutyCheck){
-//        $date=date('Y-m-d H:i:s');
-//        $laborReport['verify_at']=$date;
-//        $laborReport['group_user_id']=$userDutyCheck->group_user_id;
-//        $laborReport->update();
-//        return;
-//    }
-//    //添加临时工报表数据
-//    static function createLaborReportData($userDutyCheck){
-//        $userDetail=UserDetail::find($userDutyCheck->user_id);
-//        $name=$userDetail['full_name'];
-//        $mobile_phone=$userDetail['mobile_phone'];
-//        $identity_number=$userDetail['identity_number'];
-//        $labor_company_id=UserLabor::where('user_id',$userDutyCheck->user_id)->value('labor_company_id');
-//        $labor_company=LaborCompany::where('id',$labor_company_id)->value('name');
-//        if ($userDutyCheck->type=='登入'){
-//            $check_in_at=$userDutyCheck['checked_at'];
-//        }
-//        $date=date('Y-m-d H:i:s');
-//        $laborReport=new LaborReport([
-//            'enter_number'=>Uuid::uuid1(),
-//            'user_workgroup_id'=>$userDutyCheck->workgroup_id,
-//            'user_id'=>$userDutyCheck->user_id,
-//            'name'=>$name,
-//            'mobile_phone'=>$mobile_phone,
-//            'identity_number'=>$identity_number,
-//            'labor_company'=>$labor_company,
-//            'check_in_at'=>$check_in_at,
-//            'verify_at'=>$date,
-//            'group_user_id'=>$userDutyCheck->group_user_id,
-//        ]);
-//        $laborReport->save();
-//        $number_id=$laborReport->id;
-//        $enter_number=$userDutyCheck->workgroup_id.date ("ymd").str_pad($number_id>99999?$number_id%99999:$number_id,4,"0",STR_PAD_LEFT);
-//        $laborReport->enter_number=$enter_number;
-//        $laborReport->update();
-//        return $laborReport;
-//    }
-//    //修改临时工报表数据
-//    static function updateLaborReportData($laborReport,$userDutyCheck){
-//            //正常打卡情况
-//            if($userDutyCheck->type=='登出'){
-//                $laborReport->check_out_at=$userDutyCheck->checked_at;
-//                $checkInDate=Carbon::parse($laborReport['check_in_at']);
-//                $checkOutDate=Carbon::parse($userDutyCheck->checked_at);
-//                $hour=($checkOutDate->diffInSeconds($checkInDate))/3600; //在线时长
-//                $laborReport['online_duration']=$hour;
-//                $laborReport['working_duration']=$hour;
-//                $laborReport->update();
-//            }
-//        $date=Carbon::parse($laborReport['check_in_at'])->format('Y-m-d');
-//        $userDutyCheckOld=UserDutyCheck::where('user_id',$userDutyCheck->user_id)->orderBy('checked_at','DESC')->limit(10)->first();
-//        //补卡情况
-//        if ($userDutyCheck->type=='登入'&&$userDutyCheckOld->checked_at>$userDutyCheck->checked_at&&$userDutyCheck->checked_at<$date." 11:00".":00"){
-//            $laborReport['check_in_at']=$userDutyCheck['checked_at'];
-//            $checkInDate=Carbon::parse($laborReport['check_in_at']);
-//            if ($laborReport->check_out_at){
-//                $checkOutDate=Carbon::parse($laborReport->check_out_at);
-//                $hour=($checkOutDate->diffInSeconds($checkInDate))/3600; //在线时长
-//                $laborReport['online_duration']=$hour;
-//            }
-//            $laborReport->update();
-//        }
-//        if ($userDutyCheck->type=='登入'&&$userDutyCheckOld->checked_at<$userDutyCheck->checked_at){
-//            $userDutyCheck->save();
-//            $laborReport['working_duration']=$laborReport['online_duration'];
-//            $laborReport->update();
-//        }
-//        if ($userDutyCheck->type=='登出'&&$userDutyCheckOld->checked_at<$userDutyCheck->checked_at){
-//            $laborReport->check_out_at=$userDutyCheck->checked_at;
-//            $checkInDate=Carbon::parse($laborReport['check_in_at']);
-//            $checkOutDate=Carbon::parse($userDutyCheck->checked_at);
-//            $hour=($checkOutDate->diffInSeconds($checkInDate))/3600; //在线时长
-//            $laborReport['online_duration']=$hour;
-//            $laborReport['working_duration']=$hour;
-//            $laborReport->update();
-//        }
-//
-//        if ($laborReport&&$laborReport->check_out_at){
-//            $userDutyCheckStart=UserDutyCheck::where('user_id',$laborReport->user_id)->where('workgroup_id',$laborReport->user_workgroup_id)->where('checked_at','>=',$date." 11:00".":00")
-//                ->where('checked_at','<=',$date." 14:00:00")->where('type','登出')->first();
-//            $userDutyCheckEnd=UserDutyCheck::where('user_id',$laborReport->user_id)->where('workgroup_id',$laborReport->user_workgroup_id)->where('checked_at','>=',$date." 11:00".":00")
-//                ->where('checked_at','<=',$date." 14:00:00")->where('type','登入')->first();
-//            $beginTime=Carbon::parse($userDutyCheckStart['checked_at']);
-//            $endTime=Carbon::parse($userDutyCheckEnd['checked_at']);
-//            $lunchHour=($endTime->diffInSeconds($beginTime))/3600;
-//            if($userDutyCheck->type=='登入'&&$userDutyCheck->checked_at<=$date." 14:00:00"){
-//                $laborReport['working_duration']=$laborReport['online_duration'];
-//            }else if($userDutyCheck->type=='登出'&&$userDutyCheck->checked_at<=$date." 14:00:00"){
-//                $laborReport['working_duration']=$laborReport['online_duration'];
-//            }else{
-//                $laborReport['working_duration']=$laborReport['online_duration']-$lunchHour;
-//            }
-//            $laborReport->update();
-//        }
-//        return;
-//    }
 }

resources/views/personnel/laborReport/index.blade.php

@@ -5,7 +5,7 @@
 @section('content')
     @component('personnel.laborReport.menu')@endcomponent
 
-    <div class="d-none container-fluid modal-open" id="list">
+    <div class="d-none container-fluid modal-open" id="list" style="overflow: auto">
         <div id="form_div"></div>
         <span class="dropdown">
                 <button class="btn btn-outline-dark btn-sm form-control-sm dropdown-toggle tooltipTarget mt-1 mb-1" :class="[checkData.length>0?'btn-dark text-light':'']"
@@ -164,6 +164,7 @@
         <div class="text-info h5 btn btn">{{$laborReports->count()}}/@{{ sum }}</div>
         <div>{{$laborReports->appends($paginateParams)->links()}}</div>
         {{--      选择晚饭时长弹框      --}}
+
         <div class="modal fade" id="exampleModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
             <div class="modal-dialog">
                 <div class="modal-content">

tests/Services/StoreService/AsnSyncTest.php

@@ -23,25 +23,7 @@ class AsnSyncTest extends TestCase
 
 
     public function testAsnSync(){
-//        $dataInterval = intval(data_get(config('sync'), 'asn_sync.interval')) * 60 + 5;
-//
-//        $startDate = \Illuminate\Support\Carbon::now()->subSeconds($dataInterval);
-//
-//        $syncStartDate = data_get(config('sync'), 'asn_sync.start_at');
-//
-//        if($syncStartDate ?? false){
-//            $syncStartDate = Carbon::parse($syncStartDate);
-//            if ($startDate->lt($syncStartDate)) {
-//                $startDate = $syncStartDate;
-//            }
-//        }
         $startDate=Carbon::parse('2020-11-11 23:59:59')->subSeconds(65)->format('Y-m-d H:i:s');
-//        $startDate=Carbon::parse('2020-10-22 00:00:00')->subDays(1)->format('Y-m-d H:i:s');
-//        app('LogService')->log(__METHOD__,"start".__FUNCTION__,Carbon::now());
         app(StoreService::class)->syncWmsAsnData($startDate);
-//        app('LogService')->log(__METHOD__,"end".__FUNCTION__,Carbon::now());
-        //$asnHeaders=app(OracleDocAsnHerderService::class)->getWmsAsnOnStartDateCreate($startDate);
-        //dd($asnHeaders);
-
     }
 }