From fe2ae8cd354a306ef69d09c9c988db1a08b74268 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 26 Oct 2022 17:58:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=A1=E8=AE=B0=E5=BD=95=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E5=A2=9E=E5=8A=A0=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=8F=B7?= =?UTF-8?q?=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/hrm/views.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/apps/hrm/views.py b/apps/hrm/views.py index ae4b8e21..83a31360 100755 --- a/apps/hrm/views.py +++ b/apps/hrm/views.py @@ -27,7 +27,8 @@ from apps.utils.export import export_excel from apps.utils.viewsets import CustomGenericViewSet, CustomModelViewSet from rest_framework.permissions import IsAuthenticated -epTypeOptions = {'employee': '正式员工', 'remployee': '相关方', 'visitor': '访客', 'driver': '货车司机'} +epTypeOptions = {'employee': '正式员工', 'remployee': '相关方', + 'visitor': '访客', 'driver': '货车司机'} crOptions = {10: '上班打卡', 20: '下班打卡'} # Create your views here. @@ -87,7 +88,8 @@ class EmployeeViewSet(CustomModelViewSet): serializer.is_valid(raise_exception=True) vdata = serializer.validated_data if vdata.get('photo', None): - dhClient.request(**dhapis['person_img_upload'], file_path_rela=vdata['photo']) + dhClient.request(**dhapis['person_img_upload'], + file_path_rela=vdata['photo']) serializer.save() if ep.type == 'remployee': from apps.rpm.services import sync_to_rep @@ -232,7 +234,8 @@ class ClockRecordViewSet(ListModelMixin, CustomGenericViewSet): """导出excel 导出excel """ - field_data = ['人员类型', '人员', '所属部门', '打卡类型', '触发形式', '体温', '打卡时间'] + field_data = ['人员类型', '人员', '编号', '身份证号', + '所属部门', '打卡类型', '触发形式', '体温', '打卡时间'] queryset = self.filter_queryset(self.get_queryset()) odata = ClockRecordListSerializer(queryset, many=True).data # 处理数据 @@ -241,6 +244,8 @@ class ClockRecordViewSet(ListModelMixin, CustomGenericViewSet): data.append( [epTypeOptions[i['employee_']['type']], i['employee_']['name'], + i['employee_']['number'], + i['employee_']['id_number'], i['employee_']['belong_dept_name'], crOptions[i['type']], i['detail'].get('deviceName', None),