开启作业监控优化

apps/opm/services.py

@@ -59,6 +59,13 @@ def bind_opl(ticket: Ticket, transition: Transition, new_ticket_data: dict):
         op.save()
 
 
+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)
+
+
 def opl_audit_end(ticket: Ticket):
     # 任务执行1
     opl = Opl.objects.get(ticket=ticket)
@@ -104,6 +111,8 @@ def start_mtask(opl: Opl):
         time.sleep(3)
         opl.mtask = TaskResult.objects.get(task_id=task.task_id)
         opl.save()
+        return dict(vc_codes=vc_codes)
+    return dict(vc_codes=[])
 
 
 def close_mtask(task_id: str):

apps/opm/views.py

@@ -86,8 +86,8 @@ class OplViewSet(CustomModelViewSet):
         if obj.mtask:
             # 先关闭
             close_mtask(obj.mtask.task_id)
-        start_mtask(obj)
-        return Response()
+        res = start_mtask(obj)
+        return Response(res)
 
     @action(methods=['post'], detail=True, perms_map={'post': '*'},
             serializer_class=Serializer, logging_methods=[])