|
|
@@ -45,9 +45,7 @@ class UserDutyCheckController extends Controller
|
|
|
}
|
|
|
|
|
|
$userLaborToken = $request->cookie('userLaborToken');
|
|
|
- $user_id = Cache::get('dutyCheckTokenStr_' . $userLaborToken);
|
|
|
- var_dump($userLaborToken);
|
|
|
- var_dump($user_id);
|
|
|
+ $user_id = Cache::get('dutyCheckTokenStr_'.$userLaborToken);
|
|
|
if ($userLaborToken && $user_id) {
|
|
|
$userDetail = UserDetail::find($user_id);
|
|
|
if (!$userDetail) return redirect('personnel/checking-in/userDutyCheck/createUserDetail/' . $userDetail->mobile_phone)->with("importAndExportQRCodeType", $importAndExportQRCodeType);
|
|
|
@@ -191,7 +189,6 @@ class UserDutyCheckController extends Controller
|
|
|
if ($userDutyCheck && $userDutyCheck->export == true) return "<h1 style='color: darkred;text-align:center'>您已出场,不可再次出场!!</h1>";
|
|
|
if (!$userDutyCheck) return "<h1 style='color: red;text-align:center'>打卡异常,请联系相关人员!</h1>";
|
|
|
$userLaborToken = $userDetail->getDutyCheckToken(config('users.token_check_in_expire_minutes'));
|
|
|
- var_dump($userLaborToken);
|
|
|
$laborReportService = app('LaborReportService');
|
|
|
$laborReportService->makeOrChangeLaborReportByUserDutyCheck($userDutyCheck, $importAndExportQRCodeType);
|
|
|
$laravelEchoPrefix = config('database.redis.options.prefix');
|
|
|
@@ -253,7 +250,6 @@ class UserDutyCheckController extends Controller
|
|
|
if ($userDutyCheck&&$userDutyCheck->export==true)return "<h1 style='color: darkred;text-align:center'>您已出场,不可再次出场!</h1>";
|
|
|
if (!$userDutyCheck)return "<h1 style='color: red;text-align:center'>打卡异常,请联系相关人员!</h1>";
|
|
|
$userLaborToken=$userDetail->getDutyCheckToken(config('users.token_check_in_expire_minutes'));
|
|
|
- var_dump($userLaborToken);
|
|
|
Controller::logS(__METHOD__,"录入临时工,用户,对应工作组,打卡记录".__FUNCTION__,json_encode($userDetail));
|
|
|
$laravelEchoPrefix = config('database.redis.options.prefix');
|
|
|
return response()->view('personnel/checking-in/importAndExportSuccess',['full_name'=>$userDetail->full_name,'checked_at'=>$userDutyCheck->checked_at,'type'=>$userDutyCheck->type,'laravelEchoPrefix'=>$laravelEchoPrefix])
|
|
|
@@ -290,9 +286,7 @@ class UserDutyCheckController extends Controller
|
|
|
{
|
|
|
$userWorkgroupID = $request->input('userWorkgroupID');
|
|
|
$userLaborToken = $request->cookie('userLaborToken');
|
|
|
- $user_id = Cache::get('dutyCheckTokenStr_' . $userLaborToken);
|
|
|
- var_dump($userLaborToken);
|
|
|
- var_dump($user_id);
|
|
|
+ $user_id = Cache::get('dutyCheckTokenStr_'.$userLaborToken);
|
|
|
if ($userLaborToken && $user_id) {
|
|
|
$dateNow = Carbon::now()->format('Y-m-d');
|
|
|
$userDutyCheck = UserDutyCheck::where('user_id', $user_id)->where('checked_at', 'like', $dateNow. '%')->orderBy('id', 'desc')->first();
|