Merge branch 'master' of https://e.coding.net/ctcdevteam/cma_search

server/apps/consulting/views.py

@@ -64,7 +64,8 @@ class PolicyViewSet(OptimizationMixin, PageOrNot, CreateUpdateModelAMixin, Model
                 else:
                     return Policy.objects.none()
         else:
-            raise ParseError('请提供cate查询条件')
+            if self.request.method == 'GET':
+                raise ParseError('请提供cate查询条件')
         return super().get_queryset()
 
 class ValidationViewSet(OptimizationMixin, PageOrNot, CreateUpdateModelAMixin, ModelViewSet):

server/apps/supervision/migrations/0052_task_cate.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.12 on 2023-10-13 07:46
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('supervision', '0051_auto_20230707_1739'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='task',
+            name='cate',
+            field=models.CharField(default='', max_length=100, verbose_name='分类'),
+        ),
+    ]

server/apps/supervision/models.py

@@ -35,6 +35,7 @@ class Task(CommonBModel):
         ('已关闭', '已关闭'),
     )
     name = models.CharField('名称', max_length=100)
+    cate = models.CharField('分类', max_length=100, default='')
     end_date = models.DateField('截止时间', null=True, blank=True)
     note = models.TextField('任务备注', null=True, blank=True)
     contents = models.ManyToManyField('supervision.content', through='supervision.record')

server/apps/supervision/views.py

@@ -44,6 +44,7 @@ class TaskViewSet(CreateUpdateCustomMixin, ModelViewSet):
                  'put': 'task_update', 'delete': 'task_delete'}
     queryset = Task.objects.all()
     search_fields = ['name']
+    filterset_fields = ['cate', 'contents', 'depts']
     ordering = ['-create_time']
 
     def get_serializer_class(self):