employee 支持belong_dept filter
This commit is contained in:
parent
44778466cc
commit
a973b62fe8
|
@ -26,7 +26,8 @@ class EmployeeFilterSet(filters.FilterSet):
|
|||
fields = {
|
||||
'job_state': ['exact'],
|
||||
'show_atwork': ['exact'],
|
||||
'type': ['exact', 'in']
|
||||
'type': ['exact', 'in'],
|
||||
'belong_dept':['exact']
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@ from apps.hrm.models import Certificate, Employee
|
|||
from apps.hrm.services import HrmService
|
||||
from apps.system.models import Post, User, UserPost
|
||||
from apps.utils.sms import send_sms
|
||||
from apps.utils.tools import ranstr
|
||||
from apps.utils.tools import get_info_from_id, ranstr
|
||||
from apps.wf.models import Ticket, Transition
|
||||
from apps.rpm.models import Remployee, Rfile, Rparty, Rpj, Rpjcertificate, Rpjfile, Rpjmember
|
||||
from django.contrib.auth.hashers import make_password
|
||||
|
@ -61,6 +61,7 @@ def rpj_audit_end(ticket):
|
|||
ep.id_number = rep.id_number
|
||||
ep.name = rep.name
|
||||
ep.id_number = rep.id_number
|
||||
ep.gender = get_info_from_id(rep.id_number).get('gender', '男')
|
||||
ep.phone = rep.phone
|
||||
ep.photo = rep.photo
|
||||
ep.type = 'remployee'
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
from apps.hrm.models import Employee
|
||||
from apps.hrm.services import HrmService
|
||||
from apps.utils.sms import send_sms
|
||||
from apps.utils.tools import get_info_from_id
|
||||
from apps.vm.models import Visit, Visitor, Vpeople
|
||||
from rest_framework.exceptions import ParseError
|
||||
|
||||
|
@ -54,6 +55,7 @@ def visit_audit_end(ticket):
|
|||
else:
|
||||
ep = Employee()
|
||||
ep.id_number = visitor.id_number
|
||||
ep.gender = get_info_from_id(visitor.id_number).get('gender', '男')
|
||||
ep.name = visitor.name
|
||||
ep.phone = visitor.phone
|
||||
ep.photo = visitor.photo
|
||||
|
@ -85,6 +87,7 @@ def visit_driver_end(ticket):
|
|||
else:
|
||||
ep = Employee()
|
||||
ep.id_number = visitor.id_number
|
||||
ep.gender = get_info_from_id(visitor.id_number).get('gender', '男')
|
||||
ep.name = visitor.name
|
||||
ep.phone = visitor.phone
|
||||
ep.photo = visitor.photo
|
||||
|
|
Loading…
Reference in New Issue