From 05beed5146d1627e0e47daabb8f157d9031ec23f Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 6 Dec 2024 17:26:08 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20enm=20enstat=E8=B0=83=E6=95=B4=E4=B8=80?= =?UTF-8?q?=E4=B8=8B=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/enm/views.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/enm/views.py b/apps/enm/views.py index 9cc585a8..2f520d11 100644 --- a/apps/enm/views.py +++ b/apps/enm/views.py @@ -160,8 +160,8 @@ class MpointStatViewSet(BulkCreateModelMixin, BulkDestroyModelMixin, CustomListM serializer_class = MpointStatSerializer select_related_fields = ["mpoint", "mpoint__ep_monitored", "mpoint__ep_belong", "mgroup", "mgroup__belong_dept"] filterset_class = MpointStatFilter - ordering_fields = ['mpoint__report_sortstr', 'year', 'month', 'day', 'hour', 'year_s', 'month_s', 'day_s', 'mgroup__sort', 'create_time'] - ordering = ["mpoint__report_sortstr", "-year", "-month", "-day", "-hour", "-year_s", "-month_s", "-day_s", "mgroup__sort", "-create_time"] + ordering_fields = ['mpoint__report_sortstr', 'year', 'month', 'day', 'hour', 'year_s', 'month_s', 'day_s', 'mgroup__sort', 'create_time', "update_time"] + ordering = ["mpoint__report_sortstr", "-year", "-month", "-day", "-hour", "-year_s", "-month_s", "-day_s", "mgroup__sort"] def perform_create(self, serializer): ins = serializer.save() @@ -239,8 +239,8 @@ class EnStatViewSet(CustomListModelMixin, CustomGenericViewSet): serializer_class = EnStatSerializer select_related_fields = ["mgroup", "team", "mgroup__belong_dept"] filterset_class = EnStatFilter - ordering = ["mgroup__sort", "year_s", "month_s", "day_s", "hour"] - ordering_fields = ["mgroup__sort", "year_s", "month_s", "day_s", "hour", "update_time"] + ordering = ["mgroup__sort", "year", "month", "day", "hour", "year_s", "month_s", "day_s"] + ordering_fields = ["mgroup__sort", "year_s", "month_s", "day_s", "hour", "update_time", "create_time"] @action(methods=["post"], detail=False, perms_map={"post": "*"}, serializer_class=EnStatAnaSerializer) def analyze(self, request, *args, **kwargs):