diff --git a/hb_server/apps/hrm/views.py b/hb_server/apps/hrm/views.py index 0f87cd3..fb49034 100644 --- a/hb_server/apps/hrm/views.py +++ b/hb_server/apps/hrm/views.py @@ -76,9 +76,9 @@ class ClockRecordViewSet(CreateModelMixin, ListModelMixin, GenericViewSet): user, msg = HRMService.face_compare_from_base64(base64_data) if user: now = timezone.now() - if 7<=now.hour<=9: + if 8<=now.hour<=17: ins, created = ClockRecord.objects.get_or_create( - create_by=request.user, create_time__hour__in = [7,8], + create_by=request.user, create_time__hour__range = [8,18], create_time__year=now.year, create_time__month=now.month, create_time__day=now.day, defaults={ 'type':ClockRecord.ClOCK_WORK1, @@ -92,7 +92,7 @@ class ClockRecordViewSet(CreateModelMixin, ListModelMixin, GenericViewSet): user.is_atwork = True user.save() return Response(UserSimpleSerializer(instance=user).data) - return Response('打卡失败', status=status.HTTP_400_BAD_REQUEST) + return Response('非打卡时间范围', status=status.HTTP_400_BAD_REQUEST) return Response(msg, status=status.HTTP_400_BAD_REQUEST)