From 00853f395dd7e3ac63f4120e72b062a535dfb8de Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 5 Sep 2024 09:29:49 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20handle=5Fdate=20=E6=A0=B9=E6=8D=AEwork?= =?UTF-8?q?=5Ftime=E8=87=AA=E5=8A=A8=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/wpm/serializers.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/apps/wpm/serializers.py b/apps/wpm/serializers.py index bef3798b..c6b9e548 100644 --- a/apps/wpm/serializers.py +++ b/apps/wpm/serializers.py @@ -391,6 +391,13 @@ class MlogSerializer(CustomModelSerializer): if mtask: if mtask.start_date == mtask.end_date: attrs['handle_date'] = mtask.start_date + else: + if attrs['work_end_time']: + attrs['handle_date'] = attrs['work_end_time'].date() + 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