Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
This commit is contained in:
commit
c5e4cc48a4
|
@ -95,7 +95,7 @@ def make_sflogs(mgroup: Mgroup, start_date: datetime.date, end_date: datetime.da
|
||||||
start_time = datetime.datetime.combine(current_date, start_time_o)
|
start_time = datetime.datetime.combine(current_date, start_time_o)
|
||||||
end_time = datetime.datetime.combine(current_date, end_time_o)
|
end_time = datetime.datetime.combine(current_date, end_time_o)
|
||||||
# 以下代码是解决跨天排班时生成当天班次缺少的bug
|
# 以下代码是解决跨天排班时生成当天班次缺少的bug
|
||||||
if start_time > end_time:
|
if start_time >= end_time:
|
||||||
end_time += datetime.timedelta(days=1)
|
end_time += datetime.timedelta(days=1)
|
||||||
total_sec = (end_time - start_time).total_seconds()
|
total_sec = (end_time - start_time).total_seconds()
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue