排序变动
This commit is contained in:
parent
2302921c08
commit
a905a1cf4e
|
@ -23,7 +23,7 @@ def rpj_audit_end(ticket):
|
||||||
# 更新入厂项目人员库
|
# 更新入厂项目人员库
|
||||||
for i in Rpjmember.objects.filter(rpj=rpj):
|
for i in Rpjmember.objects.filter(rpj=rpj):
|
||||||
rep = i.remployee
|
rep = i.remployee
|
||||||
ep = Employee.objects.filter(id_number=rep.id_number, type='remployee').first()
|
ep = Employee.objects.filter(id_number=rep.id_number).first()
|
||||||
if ep:
|
if ep:
|
||||||
pass
|
pass
|
||||||
else:
|
else:
|
||||||
|
@ -32,6 +32,7 @@ def rpj_audit_end(ticket):
|
||||||
ep.name = rep.name
|
ep.name = rep.name
|
||||||
ep.phone = rep.phone
|
ep.phone = rep.phone
|
||||||
ep.photo = rep.photo
|
ep.photo = rep.photo
|
||||||
|
ep.type = 'remployee'
|
||||||
ep.save()
|
ep.save()
|
||||||
rep.employee = ep
|
rep.employee = ep
|
||||||
rep.save()
|
rep.save()
|
||||||
|
|
|
@ -274,7 +274,8 @@ class PostViewSet(CustomModelViewSet):
|
||||||
create_serializer_class = PostCreateUpdateSerializer
|
create_serializer_class = PostCreateUpdateSerializer
|
||||||
update_serializer_class = PostCreateUpdateSerializer
|
update_serializer_class = PostCreateUpdateSerializer
|
||||||
partial_update_serializer_class = PostCreateUpdateSerializer
|
partial_update_serializer_class = PostCreateUpdateSerializer
|
||||||
search_fields = ['name', 'description']
|
search_fields = ['name', 'code', 'description']
|
||||||
|
ordering = ['create_time']
|
||||||
|
|
||||||
|
|
||||||
class PermissionViewSet(CustomModelViewSet):
|
class PermissionViewSet(CustomModelViewSet):
|
||||||
|
@ -289,6 +290,7 @@ class PermissionViewSet(CustomModelViewSet):
|
||||||
update_serializer_class = PermissionCreateUpdateSerializer
|
update_serializer_class = PermissionCreateUpdateSerializer
|
||||||
partial_update_serializer_class = PermissionCreateUpdateSerializer
|
partial_update_serializer_class = PermissionCreateUpdateSerializer
|
||||||
search_fields = ['name', 'code']
|
search_fields = ['name', 'code']
|
||||||
|
ordering = ['sort', 'create_time']
|
||||||
|
|
||||||
@action(methods=['get'], detail=False, permission_classes=[IsAuthenticated])
|
@action(methods=['get'], detail=False, permission_classes=[IsAuthenticated])
|
||||||
def codes(self, request, pk=None):
|
def codes(self, request, pk=None):
|
||||||
|
@ -312,6 +314,7 @@ class DeptViewSet(CustomModelViewSet):
|
||||||
partial_update_serializer_class = DeptCreateUpdateSerializer
|
partial_update_serializer_class = DeptCreateUpdateSerializer
|
||||||
filterset_fields = ['type']
|
filterset_fields = ['type']
|
||||||
search_fields = ['name']
|
search_fields = ['name']
|
||||||
|
ordering = ['sort', 'create_time']
|
||||||
|
|
||||||
def filter_queryset(self, queryset):
|
def filter_queryset(self, queryset):
|
||||||
if not self.detail:
|
if not self.detail:
|
||||||
|
@ -339,6 +342,7 @@ class RoleViewSet(CustomModelViewSet):
|
||||||
update_serializer_class = RoleCreateUpdateSerializer
|
update_serializer_class = RoleCreateUpdateSerializer
|
||||||
partial_update_serializer_class = RoleCreateUpdateSerializer
|
partial_update_serializer_class = RoleCreateUpdateSerializer
|
||||||
search_fields = ['name', 'code']
|
search_fields = ['name', 'code']
|
||||||
|
ordering = ['create_time']
|
||||||
|
|
||||||
|
|
||||||
class PostRoleViewSet(CreateModelMixin, DestroyModelMixin, ListModelMixin, CustomGenericViewSet):
|
class PostRoleViewSet(CreateModelMixin, DestroyModelMixin, ListModelMixin, CustomGenericViewSet):
|
||||||
|
|
|
@ -27,9 +27,9 @@ def visit_audit_end(ticket):
|
||||||
for i in Vpeople.objects.filter(visit=visit):
|
for i in Vpeople.objects.filter(visit=visit):
|
||||||
visitor = i.visitor
|
visitor = i.visitor
|
||||||
if visitor.id_number and visitor.photo:
|
if visitor.id_number and visitor.photo:
|
||||||
ep = Employee.objects.filter(id_number=visitor.id_number, type='visitor').first()
|
ep = Employee.objects.filter(id_number=visitor.id_number).first()
|
||||||
else:
|
else:
|
||||||
ep = Employee.objects.filter(name=visitor.name, type='visitor', id_number=None).first()
|
ep = Employee.objects.filter(name=visitor.name, id_number=None).first()
|
||||||
if ep:
|
if ep:
|
||||||
pass
|
pass
|
||||||
else:
|
else:
|
||||||
|
@ -39,6 +39,7 @@ def visit_audit_end(ticket):
|
||||||
ep.phone = visitor.phone
|
ep.phone = visitor.phone
|
||||||
ep.photo = visitor.photo
|
ep.photo = visitor.photo
|
||||||
ep.type = 'visitor'
|
ep.type = 'visitor'
|
||||||
|
ep.belong_dept = visit.receptionist
|
||||||
ep.save()
|
ep.save()
|
||||||
visitor.employee = ep
|
visitor.employee = ep
|
||||||
visitor.visit = visit # 更新当前所属访客项目
|
visitor.visit = visit # 更新当前所属访客项目
|
||||||
|
|
Loading…
Reference in New Issue