refecor: 一些处理
This commit is contained in:
parent
df2db0ddd9
commit
24b2a98440
|
|
@ -317,6 +317,12 @@ def mlog_revert(mlog: Mlog, user: User, now: Union[datetime.datetime, None]):
|
||||||
mlog.save()
|
mlog.save()
|
||||||
|
|
||||||
|
|
||||||
|
def cal_mtask_progress(mtaskId_list = []):
|
||||||
|
"""
|
||||||
|
计算任务进度
|
||||||
|
"""
|
||||||
|
pass
|
||||||
|
|
||||||
def update_mtask(mtask: Mtask):
|
def update_mtask(mtask: Mtask):
|
||||||
from apps.pm.models import Utask
|
from apps.pm.models import Utask
|
||||||
res = Mlog.objects.filter(mtask=mtask).exclude(submit_time=None).aggregate(sum_count_real=Sum(
|
res = Mlog.objects.filter(mtask=mtask).exclude(submit_time=None).aggregate(sum_count_real=Sum(
|
||||||
|
|
|
||||||
|
|
@ -205,8 +205,9 @@ class MlogViewSet(CustomModelViewSet):
|
||||||
mlog_revert(ins, user, now)
|
mlog_revert(ins, user, now)
|
||||||
if ins.mtask:
|
if ins.mtask:
|
||||||
mtask = ins.mtask
|
mtask = ins.mtask
|
||||||
mtask.state = Mtask.MTASK_ASSGINED
|
if mtask.state == Mtask.MTASK_SUBMIT:
|
||||||
mtask.save()
|
mtask.state = Mtask.MTASK_ASSGINED
|
||||||
|
mtask.save()
|
||||||
update_mtask(ins.mtask)
|
update_mtask(ins.mtask)
|
||||||
create_auditlog('revert', ins, {}, {}, now, user,
|
create_auditlog('revert', ins, {}, {}, now, user,
|
||||||
request.data.get('change_reason', ''))
|
request.data.get('change_reason', ''))
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue