diff --git a/apps/wpm/services.py b/apps/wpm/services.py index 591d1f08..f1d552e5 100644 --- a/apps/wpm/services.py +++ b/apps/wpm/services.py @@ -317,6 +317,12 @@ def mlog_revert(mlog: Mlog, user: User, now: Union[datetime.datetime, None]): mlog.save() +def cal_mtask_progress(mtaskId_list = []): + """ + 计算任务进度 + """ + pass + def update_mtask(mtask: Mtask): from apps.pm.models import Utask res = Mlog.objects.filter(mtask=mtask).exclude(submit_time=None).aggregate(sum_count_real=Sum( diff --git a/apps/wpm/views.py b/apps/wpm/views.py index 82b70865..8ff42142 100644 --- a/apps/wpm/views.py +++ b/apps/wpm/views.py @@ -205,8 +205,9 @@ class MlogViewSet(CustomModelViewSet): mlog_revert(ins, user, now) if ins.mtask: mtask = ins.mtask - mtask.state = Mtask.MTASK_ASSGINED - mtask.save() + if mtask.state == Mtask.MTASK_SUBMIT: + mtask.state = Mtask.MTASK_ASSGINED + mtask.save() update_mtask(ins.mtask) create_auditlog('revert', ins, {}, {}, now, user, request.data.get('change_reason', ''))