fix: get_total_hour_now bug
This commit is contained in:
parent
a29ed1edc8
commit
d2e4439b73
|
|
@ -37,14 +37,14 @@ def get_total_hour_now(sflogId: str):
|
||||||
if localtime(sflog.end_time) <= now:
|
if localtime(sflog.end_time) <= now:
|
||||||
sflog.total_hour_now = 12
|
sflog.total_hour_now = 12
|
||||||
else:
|
else:
|
||||||
sflog.total_hour_now = (now - localtime(sflog.start_time)).total_seconds/3600
|
sflog.total_hour_now = (now - localtime(sflog.start_time).replace(tzinfo=None)).total_seconds/3600
|
||||||
sflog.save()
|
sflog.save()
|
||||||
return sflog.total_hour_now
|
return sflog.total_hour_now
|
||||||
else:
|
else:
|
||||||
SfLog.objects.filter(end_time__lte=now).exclude(total_hour_now=12).update(total_hour_now=12)
|
SfLog.objects.filter(end_time__lte=now).exclude(total_hour_now=12).update(total_hour_now=12)
|
||||||
sf_qs = SfLog.objects.filter(end_time__gt=now)
|
sf_qs = SfLog.objects.filter(end_time__gt=now)
|
||||||
for i in sf_qs:
|
for i in sf_qs:
|
||||||
i.total_hour_now = (now-localtime(i.start_time)).total_seconds/3600
|
i.total_hour_now = (now-localtime(i.start_time).replace(tzinfo=None)).total_seconds/3600
|
||||||
i.save()
|
i.save()
|
||||||
|
|
||||||
@shared_task(base=CustomTask)
|
@shared_task(base=CustomTask)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue