From 6ea5e0b5d7f9800708a947ec041a8d018486ac54 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 2 May 2024 00:01:47 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20make=5Fsflogs=E5=BD=93=E5=A4=A9=E7=8F=AD?= =?UTF-8?q?=E7=94=9F=E6=88=90=E7=BC=BA=E5=B0=91=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/wpm/services.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/wpm/services.py b/apps/wpm/services.py index f48c6adf..a4c5b11c 100644 --- a/apps/wpm/services.py +++ b/apps/wpm/services.py @@ -38,7 +38,10 @@ def make_sflogs(mgroup: Mgroup, start_date: datetime.date, end_date: datetime.da start_time = datetime.datetime.combine(current_date, start_time_o) end_time = datetime.datetime.combine(current_date, end_time_o) if start_time > end_time: - start_time -= datetime.timedelta(days=1) + if end_time.hour == 0: + end_time += datetime.timedelta(days=1) + else: + start_time -= datetime.timedelta(days=1) duration = end_time - start_time total_hour = duration.total_seconds() / 3600 SfLog.objects.get_or_create(mgroup=mgroup, shift=shift, start_time=start_time, defaults={