zcdsj
/
factory
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: utask增加查询条件

This commit is contained in:
caoqianming 2023-10-26 09:07:39 +08:00
parent 4869a2cb8a
commit 6ec3530862
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/pm/filters.py
View File

@ -17,6 +17,7 @@ class UtaskFilter(filters.FilterSet):
"material__type": ["exact"], "material__type": ["exact"],
"material__is_hidden": ["exact"], "material__is_hidden": ["exact"],
"belong_dept": ["exact"], "belong_dept": ["exact"],
"belong_dept__name": ["exact"],
"mgroup__belong_dept__name": ["exact"], "mgroup__belong_dept__name": ["exact"],
"mtask_utask__mgroup": ["exact"], "mtask_utask__mgroup": ["exact"],
"mtask_utask__mgroup__belong_dept": ['exact'], "mtask_utask__mgroup__belong_dept": ['exact'],

4
apps/pm/services.py
View File

@ -6,13 +6,13 @@ from apps.pm.models import Mtask, Utask
from django.db.models.query import QuerySet from django.db.models.query import QuerySet
from datetime import date, timedelta from datetime import date, timedelta
import math import math
from typing import List from typing import List, Union
class PmService: class PmService:
@classmethod @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') start_date_str = start_date.strftime('%Y%m%d')
if start_date >= end_date: if start_date >= end_date:
raise ParseError('开始时间不可大于结束时间') raise ParseError('开始时间不可大于结束时间')