diff --git a/hb_server/apps/wf/filters.py b/hb_server/apps/wf/filters.py index 0fbde88..7e2990c 100644 --- a/hb_server/apps/wf/filters.py +++ b/hb_server/apps/wf/filters.py @@ -17,6 +17,8 @@ class TicketFilterSet(filters.FilterSet): queryset = queryset.filter(participant__contains=user.id).exclude(act_state__in=[Ticket.TICKET_ACT_STATE_FINISH, Ticket.TICKET_ACT_STATE_CLOSED]) elif value == 'worked': queryset = queryset.filter(ticketflow_ticket__participant=user).exclude(create_by=user) + elif value == 'all': + pass else: queryset = queryset.none() return queryset \ No newline at end of file diff --git a/hb_server/apps/wf/migrations/0011_auto_20210930_0954.py b/hb_server/apps/wf/migrations/0011_auto_20210930_0954.py new file mode 100644 index 0000000..fedb874 --- /dev/null +++ b/hb_server/apps/wf/migrations/0011_auto_20210930_0954.py @@ -0,0 +1,31 @@ +# Generated by Django 3.2.6 on 2021-09-30 01:54 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('wf', '0010_alter_ticketflow_transition'), + ] + + operations = [ + migrations.AlterField( + model_name='state', + name='state_fields', + field=models.JSONField(default=dict, help_text='json格式字典存储,包括读写属性1:只读,2:必填,3:可选. 示例:{"create_time":1,"title":2, "sn":1}, 内置特殊字段participant_info.participant_name:当前处理人信息(部门名称、角色名称),state.state_name:当前状态的状态名,workflow.workflow_name:工作流名称', verbose_name='表单字段'), + ), + migrations.AlterField( + model_name='ticketflow', + name='participant', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='ticketflow_participant', to=settings.AUTH_USER_MODEL, verbose_name='处理人'), + ), + migrations.AlterField( + model_name='ticketflow', + name='ticket', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='ticketflow_ticket', to='wf.ticket', verbose_name='关联工单'), + ), + ]