From f0b454481306015d7c4b613f76a452b3dd0f3514 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Tue, 14 Mar 2023 23:17:56 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=89=93=E5=8D=A1=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E6=8E=A8=E6=B5=8Bbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/hrm/services.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/hrm/services.py b/apps/hrm/services.py
index 3e551956..53b9d4ee 100755
--- a/apps/hrm/services.py
+++ b/apps/hrm/services.py
@@ -214,7 +214,7 @@ class HrmService:
             nodeCode = data['info']['nodeCode']
             swip_time = data['info']['extend']['swingTime']
             e_type = data['info']['extend']['enterOrExit']
-            cls.swipe_next(nodeCode, swip_time, e_type, data['info']['extend'])
+            cls.swipe_next(nodeCode, id_number, swip_time, e_type, data['info']['extend'])
     
     @classmethod
     def swipe_offline(cls, data:dict):
@@ -226,7 +226,7 @@ class HrmService:
                 nodeCode = i['acsChannelCode']
                 swip_time = i['swingTime']
                 e_type = i['enterOrExit']
-                Thread(target=cls.swipe_next, args=(nodeCode, swip_time, e_type, i), daemon=True).start()
+                Thread(target=cls.swipe_next, args=(nodeCode, id_number, swip_time, e_type, i), daemon=True).start()
     
     @classmethod
     def swipe_next(cls, nodeCode: str, id_number: str, swip_time: str, e_type:int, detail:dict):
@@ -295,7 +295,7 @@ class HrmService:
                         ep.save()
                         # 判断是否有异常
                         # 找到最近的打卡时间
-                        cr_e = ClockRecord.objects.filter(create_time__lte=cr_20.create_time, employee=ep).order_by('-create_time').first()
+                        cr_e = ClockRecord.objects.filter(create_time__lt=cr_20.create_time, employee=ep).exclude(id=cr_20.id).order_by('-create_time').first()
                         if cr_e:
                             time_d = cr_20.create_time - cr_e.create_time
                             if cr_e.type == 10:
@@ -373,7 +373,7 @@ class HrmService:
                             ep.save()
                             # 判断是否有异常
                             # 找到最近的打卡时间
-                            cr_e = ClockRecord.objects.filter(create_time__lte=cr_20.create_time, employee=ep).order_by('-create_time').first()
+                            cr_e = ClockRecord.objects.filter(create_time__lt=cr_20.create_time, employee=ep).exclude(id=cr_20.id).order_by('-create_time').first()
                             if cr_e:
                                 time_d = cr_20.create_time - cr_e.create_time
                                 if cr_e.type == 10: