diff --git a/apps/hrm/filters.py b/apps/hrm/filters.py index 48641244..aaa82ed6 100755 --- a/apps/hrm/filters.py +++ b/apps/hrm/filters.py @@ -26,7 +26,8 @@ class EmployeeFilterSet(filters.FilterSet): fields = { 'job_state': ['exact'], 'show_atwork': ['exact'], - 'type': ['exact', 'in'] + 'type': ['exact', 'in'], + 'belong_dept':['exact'] } diff --git a/apps/rpm/services.py b/apps/rpm/services.py index c2906086..1e9fa69a 100644 --- a/apps/rpm/services.py +++ b/apps/rpm/services.py @@ -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' diff --git a/apps/vm/services.py b/apps/vm/services.py index 8a65654c..2cd5a18c 100644 --- a/apps/vm/services.py +++ b/apps/vm/services.py @@ -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