From fce4ef1c75a9f89207a234b0ebc3e19c2d75e037 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 13 Oct 2023 15:47:19 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20supervision=20task=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?cate=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supervision/migrations/0052_task_cate.py | 18 ++++++++++++++++++ server/apps/supervision/models.py | 1 + server/apps/supervision/views.py | 1 + 3 files changed, 20 insertions(+) create mode 100644 server/apps/supervision/migrations/0052_task_cate.py diff --git a/server/apps/supervision/migrations/0052_task_cate.py b/server/apps/supervision/migrations/0052_task_cate.py new file mode 100644 index 0000000..da83aac --- /dev/null +++ b/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='分类'), + ), + ] diff --git a/server/apps/supervision/models.py b/server/apps/supervision/models.py index dfab7f2..8ebb62c 100644 --- a/server/apps/supervision/models.py +++ b/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') diff --git a/server/apps/supervision/views.py b/server/apps/supervision/views.py index 982b4df..fe06874 100644 --- a/server/apps/supervision/views.py +++ b/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):