From a7b53bce2e0773c6986181ca8ed458ff8e00801f Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 1 Sep 2023 15:48:19 +0800 Subject: [PATCH] feat: shutdown_or_startup bug --- apps/enm/services.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/enm/services.py b/apps/enm/services.py index 2905d79a..b6e5cadd 100644 --- a/apps/enm/services.py +++ b/apps/enm/services.py @@ -4,7 +4,7 @@ import traceback from apps.mtm.services import get_mgroup_goals from django.db.models import Q import datetime -from django.utils.timezone import now +from django.utils import timezone def translate_eval_formula(exp_str: str, year: int, month: int, day: int, hour: int): @@ -81,10 +81,11 @@ def shutdown_or_startup(mplog: MpLog): from apps.wpm.tasks import cal_shut_hour mpoint = mplog.mpoint mgroup = mpoint.mgroup + now = timezone.now() if mplog.tag_val == 1 and mgroup.is_running is False: # 从停到开 stlog = StLog.objects.filter(mgroup=mgroup).order_by('start_time').last() - stlog.end_time = now() + stlog.end_time = now stlog.save() mgroup.is_runing = True mgroup.save()