diff --git a/apps/mtm/migrations/0028_shift_sort.py b/apps/mtm/migrations/0028_shift_sort.py new file mode 100644 index 00000000..c29e6150 --- /dev/null +++ b/apps/mtm/migrations/0028_shift_sort.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.12 on 2024-05-13 01:32 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('mtm', '0027_auto_20240429_1013'), + ] + + operations = [ + migrations.AddField( + model_name='shift', + name='sort', + field=models.PositiveSmallIntegerField(default=1, verbose_name='排序'), + ), + ] diff --git a/apps/mtm/models.py b/apps/mtm/models.py index c2f0912e..e5c0f2fd 100644 --- a/apps/mtm/models.py +++ b/apps/mtm/models.py @@ -84,6 +84,7 @@ class Shift(CommonBModel): rule = models.CharField('所属规则', max_length=10, default='默认') start_time_o = models.TimeField('开始时间') end_time_o = models.TimeField('结束时间') + sort = models.PositiveSmallIntegerField('排序', default=1) class Meta: verbose_name = '班次' diff --git a/apps/mtm/views.py b/apps/mtm/views.py index b40de2b9..4133f8fe 100644 --- a/apps/mtm/views.py +++ b/apps/mtm/views.py @@ -77,7 +77,7 @@ class ShiftViewSet(ListModelMixin, CustomGenericViewSet): queryset = Shift.objects.all() serializer_class = ShiftSerializer search_fields = ['name'] - ordering = ['id'] + ordering = ['rule', 'sort', 'id'] class MgroupViewSet(CustomModelViewSet):