From bf5d62e99d2aecbf5f39b341b145da5038e2195a Mon Sep 17 00:00:00 2001 From: caoqianming Date: Mon, 18 Dec 2023 12:25:19 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20mlog=E6=8F=90=E4=BA=A4=E6=97=B6=E5=A6=82?= =?UTF-8?q?=E6=9C=89mtask=E5=88=99handle=5Fdate=E4=B8=BAmtask=E6=97=A5?= =?UTF-8?q?=E6=9C=9F2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/wpm/serializers.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/apps/wpm/serializers.py b/apps/wpm/serializers.py index e9b41de1..fb43a85c 100644 --- a/apps/wpm/serializers.py +++ b/apps/wpm/serializers.py @@ -279,7 +279,13 @@ class MlogSerializer(CustomModelSerializer): def validate(self, attrs): mtask = attrs.get('mtask', None) if mtask: - attrs['handle_date'] = mtask.start_date + if mtask.start_date == mtask.end_date: + attrs['handle_date'] = mtask.start_date + else: + if attrs['handle_date'] >= mtask.start_date and attrs['handle_date'] <= mtask.end_date: + pass + else: + raise ValidationError('操作日期错误') if mtask.state != Mtask.MTASK_ASSGINED: raise ValidationError(f'{mtask.mgroup.name}_不可提交日志!') return attrs