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

增加筛选条件

This commit is contained in:
曹前明 2022-09-07 17:33:40 +08:00
parent 2ab41aca7f
commit 822a41cef5
6 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apps/hrm/filters.py
View File

@ -3,14 +3,14 @@ from apps.hrm.models import Certificate, ClockRecord, Employee, NotWorkRemark
class ClockRecordFilterSet(filters.FilterSet): class ClockRecordFilterSet(filters.FilterSet):
create_time_start = filters.DateFilter(field_name="create_time", lookup_expr='gte') start_create = filters.DateTimeFilter(field_name="create_time", lookup_expr='gte')
create_time_end = filters.DateFilter(field_name="create_time", lookup_expr='lte') end_create = filters.DateTimeFilter(field_name="create_time", lookup_expr='lte')
year = filters.NumberFilter(method='filter_year') year = filters.NumberFilter(method='filter_year')
month = filters.NumberFilter(method='filter_month') month = filters.NumberFilter(method='filter_month')
class Meta: class Meta:
model = ClockRecord model = ClockRecord
fields = ['employee', 'create_time_start', 'create_time_end', 'year', 'month', 'type'] fields = ['employee', 'start_create', 'end_create', 'year', 'month', 'type']
def filter_year(self, queryset, name, value): def filter_year(self, queryset, name, value):
return queryset.filter(create_time_date__year=value) return queryset.filter(create_time_date__year=value)
@ -46,12 +46,13 @@ class NotWorkRemarkFilterSet(filters.FilterSet):
class CertificateFilterSet(filters.FilterSet): class CertificateFilterSet(filters.FilterSet):
class Meta: class Meta:
model = Certificate model = Certificate
fields = { fields = {
'employee': ['exact'], 'employee': ['exact'],
'employee__name': ['exact', 'contains'], 'employee__name': ['exact', 'contains'],
'employee__user': ['exact'], 'employee__user': ['exact'],
'employee__type': ['exact', 'in'] 'employee__type': ['exact', 'in'],
} 'type': ['exact']
}

2
apps/hrm/services.py
View File

@ -149,7 +149,7 @@ class HrmService:
"endDate": endDate "endDate": endDate
} }
_, res = dhClient.request(**dhapis['card_add'], json=json_data) _, res = dhClient.request(**dhapis['card_add'], json=json_data)
time.sleep(6) time.sleep(8) # 等待确保生成卡片
cls.save(ep, data={'dh_face_card': cardNumber}) cls.save(ep, data={'dh_face_card': cardNumber})
return cardNumber return cardNumber

3
apps/system/serializers.py
View File

@ -284,7 +284,8 @@ class UserListSerializer(CustomModelSerializer):
""" """
用户列表序列化 用户列表序列化
""" """
belong_dept_ = DeptSimpleSerializer(source='belong_dept', read_only=True) belong_dept_name = serializers.CharField(source='belong_dept.name', read_only=True)
post_name = serializers.CharField(source='post.name', read_only=True)
# posts_ = PostSimpleSerializer(source='posts', many=True) # posts_ = PostSimpleSerializer(source='posts', many=True)
avatar_f = MyFilePathField(source='avatar', read_only=True) avatar_f = MyFilePathField(source='avatar', read_only=True)

2
apps/system/views.py
View File

@ -407,7 +407,7 @@ class UserViewSet(CustomModelViewSet):
update_serializer_class = UserUpdateSerializer update_serializer_class = UserUpdateSerializer
filterset_class = UserFilterSet filterset_class = UserFilterSet
search_fields = ['username', 'name', 'phone', 'email'] search_fields = ['username', 'name', 'phone', 'email']
select_related_fields = ['superior', 'belong_dept'] select_related_fields = ['superior', 'belong_dept', 'post']
prefetch_related_fields = ['posts', 'roles', 'depts'] prefetch_related_fields = ['posts', 'roles', 'depts']
ordering = ['type', 'create_time'] ordering = ['type', 'create_time']

4
apps/third/dahua.py
View File

@ -291,8 +291,8 @@ class DhClient:
_, res = self.request(**dhapis['dev_tree'], params=params) _, res = self.request(**dhapis['dev_tree'], params=params)
for i in json.loads(res): for i in json.loads(res):
json_data = { json_data = {
"minSimilarity": "70", "minSimilarity": "80",
"dpMinSimilarity": 70, "dpMinSimilarity": 80,
"surveyType": ["1"], "surveyType": ["1"],
"groups": str(settings.DAHUA_FACEGROUPID_1), "groups": str(settings.DAHUA_FACEGROUPID_1),
"chnId": i['id'] "chnId": i['id']

4
apps/wf/filters.py
View File

@ -3,8 +3,8 @@ from .models import Ticket
class TicketFilterSet(filters.FilterSet): class TicketFilterSet(filters.FilterSet):
start_create = filters.DateFilter(field_name="create_time", lookup_expr='gte') start_create = filters.DateTimeFilter(field_name="create_time", lookup_expr='gte')
end_create = filters.DateFilter(field_name="create_time", lookup_expr='lte') end_create = filters.DateTimeFilter(field_name="create_time", lookup_expr='lte')
category = filters.ChoiceFilter(choices=Ticket.category_choices, method='filter_category') category = filters.ChoiceFilter(choices=Ticket.category_choices, method='filter_category')
class Meta: class Meta: