zcdsj
/
factory
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: get_total_hour_now bug

This commit is contained in:
caoqianming 2023-08-01 08:54:01 +08:00
parent d2e4439b73
commit 80b61c9f8b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/wpm/tasks.py
View File

@ -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).replace(tzinfo=None)).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).replace(tzinfo=None)).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)
@ -77,7 +77,7 @@ def cal_shut_hour(stlogId: str):
if duration_item < 0: if duration_item < 0:
duration_item = 0 duration_item = 0
else: else:
duration_item = duration_item.total_seconds/3600 duration_item = duration_item.total_seconds()/3600
stsf.duration = duration_item stsf.duration = duration_item
stsf.save() stsf.save()
# 计算每班的总停机时间 # 计算每班的总停机时间