From 0cf481a69bc43e2cd4484cd3f9fe35838f6246e6 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 6 Dec 2024 14:46:26 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20enm=20end=5Ftime=20=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=8C=85=E5=89=8D=E4=B8=8D=E5=8C=85=E5=90=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/enm/filters.py | 2 +- apps/enm/views.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/enm/filters.py b/apps/enm/filters.py index 63c712d7..6c43d888 100644 --- a/apps/enm/filters.py +++ b/apps/enm/filters.py @@ -79,7 +79,7 @@ class MpointStatFilter(filters.FilterSet): Q(year__lt=end_year) | Q(year=end_year, month__lt=end_month) | Q(year=end_year, month=end_month, day__lt=end_day) - | Q(year=end_year, month=end_month, day=end_day, hour__lte=end_hour) + | Q(year=end_year, month=end_month, day=end_day, hour__lt=end_hour) ) elif query["type"] in ["sflog", "day_s"]: queryset = queryset.filter(Q(year_s__lt=end_year) | Q(year_s=end_year, month_s__lt=end_month) | Q(year_s=end_year, month_s=end_month, day_s__lte=end_day)) diff --git a/apps/enm/views.py b/apps/enm/views.py index bd10429d..e6b60dae 100644 --- a/apps/enm/views.py +++ b/apps/enm/views.py @@ -244,7 +244,7 @@ class EnStatViewSet(CustomListModelMixin, CustomGenericViewSet): def analyze(self, request, *args, **kwargs): """一段时间范围的工段分析数据 - 一段时间范围的工段分析数据 + 一段时间范围的工段分析数据(工段对比) """ data = request.data sr = EnStatAnaSerializer(data=data)