From 1139bb61195f82d42d18f6d85844a2e6da49df99 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 11 Apr 2024 10:56:32 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96make=5Fsflog/get=5Fsf?= =?UTF-8?q?log?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/wpm/services.py | 2 +- apps/wpm/tasks.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/wpm/services.py b/apps/wpm/services.py index 6d2742d1..bd2c3456 100644 --- a/apps/wpm/services.py +++ b/apps/wpm/services.py @@ -23,7 +23,7 @@ def get_sflog(mgroup: Mgroup, happen_time: datetime): make_sflogs(mgroup=mgroup, start_date=( happen_time-datetime.timedelta(days=1)).date(), end_date=happen_time.date()) sflog = SfLog.objects.filter( - start_time__lt=happen_time, end_time__gte=happen_time, mgroup=mgroup).first() + start_time__lt=happen_time, end_time__gte=happen_time, mgroup=mgroup).order_by('-start_time').first() return sflog diff --git a/apps/wpm/tasks.py b/apps/wpm/tasks.py index 378ca7d4..d2909467 100644 --- a/apps/wpm/tasks.py +++ b/apps/wpm/tasks.py @@ -26,7 +26,7 @@ def make_sflogs_simple(days, state_date: str, end_date: str): else: start_date = datetime.datetime.strptime(state_date, "%Y-%m-%d").date() end_date = datetime.datetime.strptime(end_date, "%Y-%m-%d").date() - mgroups = Mgroup.objects.filter(cate='section', need_enm=True).all() + mgroups = Mgroup.objects.filter(need_enm=True).all() for mgroup in mgroups: make_sflogs(mgroup, start_date, end_date)