From 59551664dbdcd39c043010572d4d75b74a81bab9 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 14 Oct 2021 09:00:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E9=80=80=E5=9B=9E=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hb_server/apps/wf/models.py | 2 +- hb_server/apps/wf/views.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hb_server/apps/wf/models.py b/hb_server/apps/wf/models.py index 4878086..4540eb0 100644 --- a/hb_server/apps/wf/models.py +++ b/hb_server/apps/wf/models.py @@ -201,7 +201,7 @@ class TicketFlow(BaseModel): 工单流转日志 """ ticket = models.ForeignKey(Ticket, on_delete=models.CASCADE, verbose_name='关联工单', related_name='ticketflow_ticket') - transition = models.ForeignKey(Transition, verbose_name='流转id', help_text='与worklow.Transition关联， 为0时表示认为干预的操作', on_delete=models.CASCADE, null=True, blank=True) + transition = models.ForeignKey(Transition, verbose_name='流转id', help_text='与worklow.Transition关联， 为空时表示认为干预的操作', on_delete=models.CASCADE, null=True, blank=True) suggestion = models.CharField('处理意见', max_length=10000, default='', blank=True) participant_type = models.IntegerField('处理人类型', default=0, help_text='0.无处理人,1.个人,2.多人', choices=State.state_participanttype_choices) participant = models.ForeignKey(User, verbose_name='处理人', on_delete=models.SET_NULL, null=True, blank=True, related_name='ticketflow_participant') diff --git a/hb_server/apps/wf/views.py b/hb_server/apps/wf/views.py index 35c980d..ab92981 100644 --- a/hb_server/apps/wf/views.py +++ b/hb_server/apps/wf/views.py @@ -227,7 +227,7 @@ class TicketViewSet(OptimizationMixin, CreateUpdateCustomMixin, CreateModelMixin ticket.act_state = Ticket.TICKET_ACT_STATE_ONGOING if transition.attribute_type == Transition.TRANSITION_ATTRIBUTE_TYPE_REFUSE: - transition.act_state = Ticket.TICKET_ACT_STATE_BACK + ticket.act_state = Ticket.TICKET_ACT_STATE_BACK # 只更新必填和可选的字段 for key, value in ticket.state.state_fields.items():