From 6ec3530862d8660d3253ff8fe723a6d71bce00c0 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 26 Oct 2023 09:07:39 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20utask=E5=A2=9E=E5=8A=A0=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/pm/filters.py | 1 + apps/pm/services.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/pm/filters.py b/apps/pm/filters.py index 5f584a45..df38d6f7 100644 --- a/apps/pm/filters.py +++ b/apps/pm/filters.py @@ -17,6 +17,7 @@ class UtaskFilter(filters.FilterSet): "material__type": ["exact"], "material__is_hidden": ["exact"], "belong_dept": ["exact"], + "belong_dept__name": ["exact"], "mgroup__belong_dept__name": ["exact"], "mtask_utask__mgroup": ["exact"], "mtask_utask__mgroup__belong_dept": ['exact'], diff --git a/apps/pm/services.py b/apps/pm/services.py index 524b47d6..211b9994 100644 --- a/apps/pm/services.py +++ b/apps/pm/services.py @@ -6,13 +6,13 @@ from apps.pm.models import Mtask, Utask from django.db.models.query import QuerySet from datetime import date, timedelta import math -from typing import List +from typing import List, Union class PmService: @classmethod - def make_utasks_from_orderitems(cls, user, orderitemIds: List[str], start_date: date, end_date: date, belong_dept): + def make_utasks_from_orderitems(cls, user, orderitemIds: List[str], start_date: date, end_date: date, belong_dept: Union[Dept, None]): start_date_str = start_date.strftime('%Y%m%d') if start_date >= end_date: raise ParseError('开始时间不可大于结束时间')