From 477976f86cd30a5a1723659de9cd979097ed92c6 Mon Sep 17 00:00:00 2001 From: zty Date: Tue, 14 Oct 2025 10:21:50 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20ofm-views=20=E4=BF=AE=E6=94=B9=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E5=80=92=E5=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/enm/models.py | 2 +- apps/ofm/views.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/enm/models.py b/apps/enm/models.py index 189f0c55..be18bbd3 100644 --- a/apps/enm/models.py +++ b/apps/enm/models.py @@ -62,7 +62,7 @@ class Mpoint(CommonBModel): cal_coefficient = models.FloatField("计算系数", null=True, blank=True) mpoint_from = models.ForeignKey("self", verbose_name="来源自采测点", related_name="mp_mpoint_from", on_delete=models.SET_NULL, null=True, blank=True) - cal_related_mgroup_running = models.PositiveSmallIntegerField("与工段运行状态的关联", default=10, choices=[(10, "运行时统计")], null=True, blank=True) + cal_related_mgroup_running = models.PositiveSmallIntegerField("与工段运行状态的关联", default=10, choices=[(10, "不涉及"), (20, "运行时统计")], null=True, blank=True) @classmethod def cache_key(cls, code: str): diff --git a/apps/ofm/views.py b/apps/ofm/views.py index 86b7b785..2a09878f 100644 --- a/apps/ofm/views.py +++ b/apps/ofm/views.py @@ -123,7 +123,7 @@ class LendingSealViewSet(CustomModelViewSet): queryset = LendingSeal.objects.all() serializer_class = LendingSealSerializer filterset_class = SealFilter - ordering = ["create_time"] + ordering = ["-create_time"] data_filter = True @@ -134,7 +134,7 @@ class VehicleViewSet(CustomModelViewSet): """ queryset = Vehicle.objects.all() serializer_class = VehicleSerializer - ordering = ["create_time"] + ordering = ["-create_time"] class FilerecordViewSet(CustomModelViewSet): @@ -145,7 +145,7 @@ class FilerecordViewSet(CustomModelViewSet): queryset = FileRecord.objects.all() serializer_class = FileRecordSerializer filterset_fields = [ "name", "number"] - ordering = ["create_time", "number", "name"] + ordering = ["-create_time", "number", "name"] class FileborrowViewSet(CustomModelViewSet): @@ -167,7 +167,7 @@ class PublicityViewSet(CustomModelViewSet): queryset = Publicity.objects.all() serializer_class = PublicitySerializer filterset_fields = ["title","number"] - ordering = ["create_time", "number"] + ordering = ["-create_time", "number"] # class PatentInfoViewSet(CustomModelViewSet):