From 7ab3535c83ac5df0dbd33b97bbc1de3f28642524 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 21 Jun 2023 15:31:36 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20task=5Fticket=20=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=8F=91=E9=80=81=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/wf/services.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/apps/wf/services.py b/apps/wf/services.py index c8c4f927..8e87e97e 100755 --- a/apps/wf/services.py +++ b/apps/wf/services.py @@ -431,7 +431,7 @@ class WfService(object): @classmethod def task_ticket(cls, ticket: Ticket): """ - 执行任务(自定义任务或通知) + 执行任务(自定义任务和通知) """ state = ticket.state # 如果目标状态有func,由func执行额外操作(比如发送通知) @@ -440,14 +440,14 @@ class WfService(object): m = importlib.import_module(module) f = getattr(m, func) f(ticket=ticket) # 同步执行 - else: - # wf默认只发送通知 - last_log = TicketFlow.objects.filter(ticket=ticket).order_by('-create_time').first() - if (last_log.state != state or - last_log.intervene_type == Transition.TRANSITION_INTERVENE_TYPE_DELIVER or - ticket.in_add_node): - # 如果状态变化或是转交加签的情况再发送通知 - Thread(target=send_ticket_notice_t, args=(ticket,), daemon=True).start() + + # wf默认只发送通知 + last_log = TicketFlow.objects.filter(ticket=ticket).order_by('-create_time').first() + if (last_log.state != state or + last_log.intervene_type == Transition.TRANSITION_INTERVENE_TYPE_DELIVER or + ticket.in_add_node): + # 如果状态变化或是转交加签的情况再发送通知 + Thread(target=send_ticket_notice_t, args=(ticket,), daemon=True).start() # 如果目标状态是脚本则异步执行 if state.participant_type == State.PARTICIPANT_TYPE_ROBOT: