From 822a41cef5f8996a161bc5b8d588ef3f92110e17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E5=89=8D=E6=98=8E?= <909355014@qq.com>
Date: Wed, 7 Sep 2022 17:33:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=AD=9B=E9=80=89=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/hrm/filters.py        | 13 +++++++------
 apps/hrm/services.py       |  2 +-
 apps/system/serializers.py |  3 ++-
 apps/system/views.py       |  2 +-
 apps/third/dahua.py        |  4 ++--
 apps/wf/filters.py         |  4 ++--
 6 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/apps/hrm/filters.py b/apps/hrm/filters.py
index 2e623b6b..803be528 100755
--- a/apps/hrm/filters.py
+++ b/apps/hrm/filters.py
@@ -3,14 +3,14 @@ from apps.hrm.models import Certificate, ClockRecord, Employee, NotWorkRemark
 
 
 class ClockRecordFilterSet(filters.FilterSet):
-    create_time_start = filters.DateFilter(field_name="create_time", lookup_expr='gte')
-    create_time_end = filters.DateFilter(field_name="create_time", lookup_expr='lte')
+    start_create = filters.DateTimeFilter(field_name="create_time", lookup_expr='gte')
+    end_create = filters.DateTimeFilter(field_name="create_time", lookup_expr='lte')
     year = filters.NumberFilter(method='filter_year')
     month = filters.NumberFilter(method='filter_month')
 
     class Meta:
         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):
         return queryset.filter(create_time_date__year=value)
@@ -46,12 +46,13 @@ class NotWorkRemarkFilterSet(filters.FilterSet):
 
 
 class CertificateFilterSet(filters.FilterSet):
-    
+
     class Meta:
         model = Certificate
         fields = {
             'employee': ['exact'],
             'employee__name': ['exact', 'contains'],
             'employee__user': ['exact'],
-            'employee__type': ['exact', 'in']
-        }
\ No newline at end of file
+            'employee__type': ['exact', 'in'],
+            'type': ['exact']
+        }
diff --git a/apps/hrm/services.py b/apps/hrm/services.py
index 41520875..1e620973 100755
--- a/apps/hrm/services.py
+++ b/apps/hrm/services.py
@@ -149,7 +149,7 @@ class HrmService:
                 "endDate": endDate
             }
             _, res = dhClient.request(**dhapis['card_add'], json=json_data)
-            time.sleep(6)
+            time.sleep(8)  # 等待确保生成卡片
             cls.save(ep, data={'dh_face_card': cardNumber})
             return cardNumber
 
diff --git a/apps/system/serializers.py b/apps/system/serializers.py
index 695c9e5a..b1953c2a 100755
--- a/apps/system/serializers.py
+++ b/apps/system/serializers.py
@@ -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)
     avatar_f = MyFilePathField(source='avatar', read_only=True)
 
diff --git a/apps/system/views.py b/apps/system/views.py
index e2b7bb96..cd5e2ed9 100755
--- a/apps/system/views.py
+++ b/apps/system/views.py
@@ -407,7 +407,7 @@ class UserViewSet(CustomModelViewSet):
     update_serializer_class = UserUpdateSerializer
     filterset_class = UserFilterSet
     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']
     ordering = ['type', 'create_time']
 
diff --git a/apps/third/dahua.py b/apps/third/dahua.py
index 6a94b599..137fe6ac 100644
--- a/apps/third/dahua.py
+++ b/apps/third/dahua.py
@@ -291,8 +291,8 @@ class DhClient:
         _, res = self.request(**dhapis['dev_tree'], params=params)
         for i in json.loads(res):
             json_data = {
-                "minSimilarity": "70",
-                "dpMinSimilarity": 70,
+                "minSimilarity": "80",
+                "dpMinSimilarity": 80,
                 "surveyType": ["1"],
                 "groups": str(settings.DAHUA_FACEGROUPID_1),
                 "chnId": i['id']
diff --git a/apps/wf/filters.py b/apps/wf/filters.py
index 76cd7b1e..6960416e 100755
--- a/apps/wf/filters.py
+++ b/apps/wf/filters.py
@@ -3,8 +3,8 @@ from .models import Ticket
 
 
 class TicketFilterSet(filters.FilterSet):
-    start_create = filters.DateFilter(field_name="create_time", lookup_expr='gte')
-    end_create = filters.DateFilter(field_name="create_time", lookup_expr='lte')
+    start_create = filters.DateTimeFilter(field_name="create_time", lookup_expr='gte')
+    end_create = filters.DateTimeFilter(field_name="create_time", lookup_expr='lte')
     category = filters.ChoiceFilter(choices=Ticket.category_choices, method='filter_category')
 
     class Meta: