diff --git a/server/apps/ability/migrations/0033_auto_20220606_1323.py b/server/apps/ability/migrations/0033_auto_20220606_1323.py new file mode 100644 index 0000000..dc1ca9c --- /dev/null +++ b/server/apps/ability/migrations/0033_auto_20220606_1323.py @@ -0,0 +1,33 @@ +# Generated by Django 3.0.5 on 2022-06-06 05:23 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('ability', '0032_auto_20220519_0924'), + ] + + operations = [ + migrations.AddField( + model_name='qaction', + name='num2', + field=models.PositiveIntegerField(blank=True, null=True, verbose_name='新增参数数量'), + ), + migrations.AddField( + model_name='qaction', + name='num3', + field=models.PositiveIntegerField(blank=True, null=True, verbose_name='新增方法标准数量'), + ), + migrations.AddField( + model_name='qaction', + name='num4', + field=models.PositiveIntegerField(blank=True, null=True, verbose_name='新增产品标准数量'), + ), + migrations.AlterField( + model_name='qaction', + name='num', + field=models.PositiveIntegerField(blank=True, null=True, verbose_name='新增对象数量'), + ), + ] diff --git a/server/apps/ability/models.py b/server/apps/ability/models.py index fce4ce5..ba9fd8a 100644 --- a/server/apps/ability/models.py +++ b/server/apps/ability/models.py @@ -204,7 +204,10 @@ class QAction(CommonBModel): on_delete=models.CASCADE, related_name='quali_atype') afield = models.ForeignKey(Dict, null=True, blank=True, verbose_name='所属领域', on_delete=models.CASCADE, related_name='quali_afield') - num = models.PositiveIntegerField('新增能力数量', null=True, blank=True) + num = models.PositiveIntegerField('新增对象数量', null=True, blank=True) + num2 = models.PositiveIntegerField('新增参数数量', null=True, blank=True) + num3 = models.PositiveIntegerField('新增方法标准数量', null=True, blank=True) + num4 = models.PositiveIntegerField('新增产品标准数量', null=True, blank=True) qtask = models.ForeignKey(QTask, on_delete=models.CASCADE) value1 = JSONField('值1', null=True, blank=True, default=dict) value2 = JSONField('值2', null=True, blank=True, default=dict) diff --git a/server/apps/ability/serializers_qtask.py b/server/apps/ability/serializers_qtask.py index c827508..a984138 100644 --- a/server/apps/ability/serializers_qtask.py +++ b/server/apps/ability/serializers_qtask.py @@ -144,7 +144,7 @@ class QActionQualiUpdateSerializer(serializers.ModelSerializer): class QActionACreateSerializer(serializers.ModelSerializer): class Meta: model = QAction - fields = ['atype', 'afield', 'file', 'num', 'qtask'] + fields = ['atype', 'afield', 'file', 'num', 'qtask', 'num2', 'num3', 'num4'] extra_kwargs = {'atype': {'required': True}, 'afield': {'required': True}, 'file': {'required': True}} def create(self, validated_data): diff --git a/server/apps/vod/views.py b/server/apps/vod/views.py index ee11e4c..89d1687 100644 --- a/server/apps/vod/views.py +++ b/server/apps/vod/views.py @@ -48,8 +48,8 @@ class VideoViewSet(PageOrNot, CreateUpdateModelAMixin, ModelViewSet): search_fields = ['name', 'category__name', 'description'] # filterset_fields = ['category'] serializer_class = VideoSerializer - ordering_fields = ['create_time', 'sort_str', 'views', 'viewsp'] - ordering = ['sort_str', '-create_time'] + ordering_fields = ['category__sort', 'sort_str', 'views', 'viewsp'] + ordering = ['category__sort', 'sort_str'] def get_serializer_class(self): if self.action in ['list', 'retrieve']: