Merge branch 'zzd' of ssh://was.baoshi56.com:10022/var/git/bswas into zzd

app/Http/Controllers/PersonnelController.php

@@ -89,19 +89,24 @@ class PersonnelController extends Controller
     //去往任务审核
     public function missionAudit(Request $request){
         if(!Gate::allows('人事管理-任务审核')){ return redirect(url('/'));  }
-        $processDailyParticipants=ProcessDailyParticipant::with(['processDaily','user_detail'])
-            ->orderBy('id','DESC');
+        $processDailyParticipants=ProcessDailyParticipant::with(['processDaily','user_detail'=>function($builder){
+           return $builder->with(['user'=>function($builder){
+               return $builder->with(['userWorkgroups']);
+           }]);
+        }])->orderBy('id','DESC');
         $start_date=$request->input('start_date');
         $end_date=$request->input('end_date');
         $full_name=$request->input('full_name');
         $mobile_phone=$request->input('mobile_phone');
         if ($start_date) {
             $processDailyParticipants->whereHas('processDaily',function (Builder $builder)use($start_date){
+                $start_date=$start_date." 00:00:00";
                 $builder->where('date','>=',$start_date);
             });
         }
         if ($end_date) {
             $processDailyParticipants->whereHas('processDaily',function (Builder $builder)use($end_date){
+                $end_date=$end_date." 23:59:59";
                 $builder->where('date','<=',$end_date);
             });
         }

app/Http/Controllers/UserDutyCheckController.php

@@ -73,7 +73,8 @@ class UserDutyCheckController extends Controller
                 $user->userWorkgroups()->sync([$userWorkgroupID]);
             }
             $userDutyCheck=$this->dutyCheck($userDetail->user_id);
-            if (!$userDutyCheck)return "<h1 style='color: red'>打卡异常，请联系相关人员!</h1>";
+            if ($userDutyCheck&&$userDutyCheck->error)return "<h1 style='color: darkred;text-align:center'>重复打卡!</h1>";
+            if (!$userDutyCheck)return "<h1 style='color: red;text-align:center'>打卡异常，请联系相关人员!</h1>";
             $userWorkgroups=$userDetail->user->userWorkgroups();
             if($userWorkgroups->count()>0)
                 $group_name=$userDetail->user->userWorkgroups->first()['name'];
@@ -90,12 +91,14 @@ class UserDutyCheckController extends Controller
         $userDetail=UserDetail::where('mobile_phone',$mobile_phone)->first();
         if (!$userDetail)   return redirect('personnel/checking-in/userDutyCheck/createUserDetail/'.$mobile_phone)->with("userWorkgroupID",$userWorkgroupID);
         $user=User::find($userDetail->user_id);
-        if (Cache::has('tokenUser_'.$user->id))return "<h1 style='color: red'>请使用原有设备进行打卡,如无法使用原有设备请联系管理人员解绑设备!</h1>";
+        if (Cache::has('tokenUser_'.$user->id))return "<h1 style='color: red;text-align:center'>请使用原有设备进行打卡,如无法使用原有设备请联系管理人员解绑设备!</h1>";
         if ($userWorkgroupID)$user->userWorkgroups()->sync([$userWorkgroupID]);
         $userDutyCheck=$this->dutyCheck($userDetail->user_id);
-        if (!$userDutyCheck)return "<h1 style='color: red'>打卡异常，请联系相关人员!</h1>";
+        if ($userDutyCheck&&$userDutyCheck->error)return "<h1 style='color: darkred;text-align:center'>重复打卡!</h1>";
+        if (!$userDutyCheck)return "<h1 style='color: red;text-align:center'>打卡异常，请联系相关人员!</h1>";
         $userLaborToken=$user->token(config('users.token_check_in_expire_minutes'));
-        return response()->view('personnel/checking-in/success',['full_name'=>$userDetail->full_name,'checked_at'=>$userDutyCheck->checked_at])
+        $group_name=$userDetail->user->userWorkgroups->first()['name'];
+        return response()->view('personnel/checking-in/success',['group_name'=>$group_name??'','full_name'=>$userDetail->full_name,'checked_at'=>$userDutyCheck->checked_at])
             ->cookie('userLaborToken',$userLaborToken,config('users.token_check_in_expire_minutes'),'/');
     }
     //去往登记资料页面
@@ -130,10 +133,12 @@ class UserDutyCheckController extends Controller
         ]);
         $userLabor->save();
         $userDutyCheck=$this->dutyCheck($user->id);
-        if (!$userDutyCheck)return "<h1 style='color: red'>打卡异常，请联系相关人员!</h1>";
+        if ($userDutyCheck&&$userDutyCheck->error)return "<h1 style='color: darkred;text-align:center'>重复打卡!</h1>";
+        if (!$userDutyCheck)return "<h1 style='color: red;text-align:center'>打卡异常，请联系相关人员!</h1>";
         $userLaborToken=$user->token(config('users.token_check_in_expire_minutes'));
         $this->log(__METHOD__,"录入临时工,用户,对应工作组,打卡记录".__FUNCTION__,json_encode($request));
-        return response()->view('personnel/checking-in/success',['full_name'=>$userDetail->full_name,'checked_at'=>$userDutyCheck->checked_at])
+        $group_name=$userDetail->user->userWorkgroups->first()['name'];
+        return response()->view('personnel/checking-in/success',['group_name'=>$group_name??'','full_name'=>$userDetail->full_name,'checked_at'=>$userDutyCheck->checked_at])
             ->cookie('userLaborToken',$userLaborToken,config('users.token_check_in_expire_minutes'),'/');
     }
 
@@ -154,6 +159,10 @@ class UserDutyCheckController extends Controller
         $lastDate=Carbon::parse($userDutyCheckOld->checked_at);
         $thisDate=Carbon::parse($date);
         $diffDate=$thisDate->diffInMinutes($lastDate);
+        if($diffDate<=5){
+            $userDutyCheck->error=true;
+            return $userDutyCheck;
+        }
         if ($userDutyCheckOld->type=="登入"){
             switch ($diffDate){
                 case $diffDate<=20:

resources/views/personnel/checking-in/missionAudit.blade.php

@@ -71,6 +71,7 @@
                     <td>工时差</td>
                     <td>计费工时</td>
                     <td>计件数量</td>
+                    <th>工作组</th>
                     <td>查看</td>
                     <td>审核</td>
                 </tr>
@@ -91,6 +92,7 @@
                     <td class="text-danger">@{{ processDailyParticipant.diff }}</td>
                     <td class="text-danger">@{{ processDailyParticipant.billingHour }}</td>
                     <td>@{{ processDailyParticipant.unit_count }}</td>
+                    <td><span v-if="processDailyParticipant.user_detail&&processDailyParticipant.user_detail.user&&processDailyParticipant.user_detail.user.user_workgroups.length>0">@{{ processDailyParticipant.user_detail.user.user_workgroups[0].name }}</span></td>
                     <td><button v-if="processDailyParticipant.user_detail" @click="showUserDetail(processDailyParticipant.user_id)" class="btn btn-info">查看</button></td>
                     <td><b v-if="processDailyParticipant.status=='已审核'" class="text-success">已审核</b>
                         <button v-else class="btn btn-primary" @click="storeMissionAudit(processDailyParticipant.id)">审核</button>