From 47c7d28ed18fe3a4b3a874a0fe143128ee1f590e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E5=89=8D=E6=98=8E?= <909355014@qq.com>
Date: Tue, 13 Sep 2022 11:28:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=81=9C=E6=AD=A2=E4=BD=9C=E4=B8=9A=E7=9B=91?=
 =?UTF-8?q?=E6=8E=A7=20=E6=89=8B=E5=8A=A8=E5=A4=84=E7=90=86=E4=B8=80?=
 =?UTF-8?q?=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/opm/services.py | 8 ++++++--
 apps/opm/views.py    | 6 +++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

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()