Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
This commit is contained in:
commit
3901a57986
|
@ -238,6 +238,7 @@ class EnStatViewSet(CustomListModelMixin, CustomGenericViewSet):
|
||||||
select_related_fields = ["mgroup", "team", "mgroup__belong_dept"]
|
select_related_fields = ["mgroup", "team", "mgroup__belong_dept"]
|
||||||
filterset_class = EnStatFilter
|
filterset_class = EnStatFilter
|
||||||
ordering = ["mgroup__sort", "year_s", "month_s", "day_s", "hour"]
|
ordering = ["mgroup__sort", "year_s", "month_s", "day_s", "hour"]
|
||||||
|
ordering_fields = ["mgroup__sort", "year_s", "month_s", "day_s", "hour", "update_time"]
|
||||||
|
|
||||||
@action(methods=["post"], detail=False, perms_map={"post": "*"}, serializer_class=EnStatAnaSerializer)
|
@action(methods=["post"], detail=False, perms_map={"post": "*"}, serializer_class=EnStatAnaSerializer)
|
||||||
def analyze(self, request, *args, **kwargs):
|
def analyze(self, request, *args, **kwargs):
|
||||||
|
|
Loading…
Reference in New Issue