Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory

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):

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):