diff --git a/apps/pm/tasks.py b/apps/pm/tasks.py index 95a9533f..4c19d260 100644 --- a/apps/pm/tasks.py +++ b/apps/pm/tasks.py @@ -13,12 +13,14 @@ def complete_mtask(): 将2天前未提交的任务且数量已达标的任务标记为已完成 """ now = datetime.now().date() - mtasks = Mtask.objects.filter(state=Mtask.MTASK_ASSGINED, - end_date__lte=now-timedelta(days=2), - count_ok__gte=F('count')) - mtasks.update(state=Mtask.MTASK_SUBMIT) + Mtask.objects.filter(state=Mtask.MTASK_ASSGINED, + end_date__lte=now-timedelta(days=2), + count_ok__gte=F('count')).update(state=Mtask.MTASK_SUBMIT) + # Mtask.objects.filter(state=Mtask.MTASK_ASSGINED, + # end_date__lte=now-timedelta(days=7)).update(state=Mtask.MTASK_STOP) - utasks = Utask.objects.filter(id__in=mtasks.values_list("utask__id", flat=True)) + utasks = Utask.objects.filter(state__in=[Utask.UTASK_ASSGINED, Utask.UTASK_WORKING], + end_date__lte=now-timedelta(days=2)) for utask in utasks: PmService.utask_submit(utask=utask, raise_e=False) \ No newline at end of file