diff --git a/apps/wpm/services.py b/apps/wpm/services.py index c283ac5f..91ddfe34 100644 --- a/apps/wpm/services.py +++ b/apps/wpm/services.py @@ -686,6 +686,8 @@ def update_mtask(mtask: Mtask, fill_way: int = 10): utask.state = Utask.UTASK_WORKING if Mtask.objects.filter(utask=utask).exclude(state=Mtask.MTASK_SUBMIT).count() == 0: utask.state = Utask.UTASK_SUBMIT + elif utask.state == Utask.UTASK_SUBMIT: + utask.state = Utask.UTASK_WORKING if utask.count_ok > 0 else Utask.UTASK_ASSGINED utask.save() elif fill_way in [Mlog.MLOG_23, Mlog.MLOG_12]: # 已经提交的日志 @@ -717,6 +719,8 @@ def update_mtask(mtask: Mtask, fill_way: int = 10): utask.count_notok = res2['sum_count_notok'] if res2['sum_count_notok'] else 0 # if Mtask.objects.filter(utask=utask).exclude(state=Mtask.MTASK_SUBMIT).count() == 0: # utask.state = Utask.UTASK_SUBMIT + if utask.state == Utask.UTASK_SUBMIT and Mtask.objects.filter(utask=utask).exclude(state=Mtask.MTASK_SUBMIT).exists(): + utask.state = Utask.UTASK_WORKING if utask.count_ok > 0 else Utask.UTASK_ASSGINED utask.save() def handover_submit(handover:Handover, user: User, now: Union[datetime.datetime, None]):