|
@@ -127,6 +127,7 @@ class UserDutyCheckController extends Controller
|
|
|
]);
|
|
]);
|
|
|
$userLabor->save();
|
|
$userLabor->save();
|
|
|
$userDutyCheck=$this->dutyCheck($user->id);
|
|
$userDutyCheck=$this->dutyCheck($user->id);
|
|
|
|
|
+ if ($userDutyCheck&&$userDutyCheck==1)return "<h1 style='color: yellow'>重复打卡!</h1>";
|
|
|
if (!$userDutyCheck)return "<h1 style='color: red'>打卡异常，请联系相关人员!</h1>";
|
|
if (!$userDutyCheck)return "<h1 style='color: red'>打卡异常，请联系相关人员!</h1>";
|
|
|
$userLaborToken=$user->token(config('users.token_check_in_expire_minutes'));
|
|
$userLaborToken=$user->token(config('users.token_check_in_expire_minutes'));
|
|
|
$this->log(__METHOD__,"录入临时工,用户,对应工作组,打卡记录".__FUNCTION__,json_encode($request));
|
|
$this->log(__METHOD__,"录入临时工,用户,对应工作组,打卡记录".__FUNCTION__,json_encode($request));
|
|
@@ -151,6 +152,7 @@ class UserDutyCheckController extends Controller
|
|
|
$lastDate=Carbon::parse($userDutyCheckOld->checked_at);
|
|
$lastDate=Carbon::parse($userDutyCheckOld->checked_at);
|
|
|
$thisDate=Carbon::parse($date);
|
|
$thisDate=Carbon::parse($date);
|
|
|
$diffDate=$thisDate->diffInMinutes($lastDate);
|
|
$diffDate=$thisDate->diffInMinutes($lastDate);
|
|
|
|
|
+ if($diffDate<=5)return 1;
|
|
|
if ($userDutyCheckOld->type=="登入"){
|
|
if ($userDutyCheckOld->type=="登入"){
|
|
|
switch ($diffDate){
|
|
switch ($diffDate){
|
|
|
case $diffDate<=20:
|
|
case $diffDate<=20:
|
Zhouzhendong