diff --git a/apps/opm/services.py b/apps/opm/services.py index 2b43ee4c..d9d3611e 100644 --- a/apps/opm/services.py +++ b/apps/opm/services.py @@ -62,8 +62,12 @@ def bind_opl(ticket: Ticket, transition: Transition, new_ticket_data: dict): def t_submit_close_mtask(ticket: Ticket, transition: Transition, new_ticket_data: dict): # 提交作业关闭时关闭作业监控 opl = Opl.objects.filter(ticket=ticket).first() - if opl and opl.mtask: - close_mtask(opl.mtask.task_id) + mtask = opl.mtask + if opl and mtask: + close_mtask(mtask.task_id) + # 防止没变化,手动处理一下 + mtask.status = 'REVOKED' + mtask.save() def opl_audit_end(ticket: Ticket): diff --git a/apps/opm/views.py b/apps/opm/views.py index 4de61d35..85d50198 100644 --- a/apps/opm/views.py +++ b/apps/opm/views.py @@ -98,8 +98,12 @@ class OplViewSet(CustomModelViewSet): 停止作业监控 """ obj = self.get_object() + mtask = obj.mtask if obj.mtask: - close_mtask(obj.mtask.task_id) + close_mtask(mtask.task_id) + # 防止没变化,手动处理一下 + mtask.status = 'REVOKED' + mtask.save() return Response()