From a6fadedee2f8070ac88e65bb7879a3d5529956dd Mon Sep 17 00:00:00 2001 From: caoqianming Date: Mon, 11 Nov 2024 17:00:33 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20handle=5Fdate=E4=BD=BF=E7=94=A8localdate?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=97=A5=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/wpm/serializers.py | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/apps/wpm/serializers.py b/apps/wpm/serializers.py index 2ac94141..70eb2754 100644 --- a/apps/wpm/serializers.py +++ b/apps/wpm/serializers.py @@ -425,16 +425,9 @@ class MlogSerializer(CustomModelSerializer): attrs['handle_date'] = mtask.start_date else: if attrs['work_end_time']: - attrs['handle_date'] = attrs['work_end_time'].date() + attrs['handle_date'] = localdate(attrs['work_end_time']) elif attrs['work_start_time']: - attrs['handle_date'] = attrs['work_start_time'].date() - # if attrs['handle_date'] >= mtask.start_date and attrs['handle_date'] <= mtask.end_date: - # pass - # else: - # if attrs['handle_date'] >= mtask.start_date and attrs['handle_date'] <= mtask.end_date: - # pass - # else: - # raise ValidationError('操作日期错误') + attrs['handle_date'] = localdate(attrs['work_start_time']) mtaskb: Mtaskb = attrs.get('mtaskb', None) if mtaskb: mtask = mtaskb.mtask