|
@@ -213,7 +213,11 @@ class ApiController extends Controller
|
|
$result = 'ok';
|
|
$result = 'ok';
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- return response()->json(['status' => 'success', 'result' => $result]);
|
|
|
|
|
|
+ $now = Carbon::today()->toDateTimeString();
|
|
|
|
+ $checkCard = CheckCard::where([
|
|
|
|
+ ['begin_date_time', '>', $now]
|
|
|
|
+ ])->whereNotNull('end_date_time')->orderBy('begin_date_time', 'desc')->first();
|
|
|
|
+ return response()->json(['status' => 'success', 'result' => $result, 'checkCard' => $checkCard]);
|
|
}
|
|
}
|
|
|
|
|
|
public function startCheckCard(Request $request)
|
|
public function startCheckCard(Request $request)
|