From 7f8d7332aa25879a089606ad6f7e30a0fd9d1b30 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 16 Mar 2023 00:08:39 +0800
Subject: [PATCH] =?UTF-8?q?refector:=20clock=20record=20detail=E8=BF=98?=
 =?UTF-8?q?=E6=98=AF=E5=A4=9A=E6=94=BE=E4=B8=80=E4=BA=9B=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/hrm/services.py | 7 +++----
 apps/hrm/tasks.py    | 6 +-----
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/apps/hrm/services.py b/apps/hrm/services.py
index 1adc9cb0..543f49c0 100755
--- a/apps/hrm/services.py
+++ b/apps/hrm/services.py
@@ -212,10 +212,9 @@ class HrmService:
         id_number = data['info']['extend'].get('paperNumber', None)
         if id_number:
             nodeCode = data['info']['extend']['acsChannelCode']
-            detail = {'id':data['info']['extend']['id'], 'channelCode': nodeCode}
             swip_time = data['info']['extend']['swingTime']
             e_type = data['info']['extend']['enterOrExit']
-            cls.swipe_next(nodeCode, id_number, swip_time, e_type, detail)
+            cls.swipe_next(nodeCode, id_number, swip_time, e_type, data['info']['extend'])
     
     @classmethod
     def swipe_offline(cls, data:dict):
@@ -225,10 +224,9 @@ class HrmService:
             id_number = i.get('paperNumber', None)
             if id_number:
                 nodeCode = i['acsChannelCode']
-                detail = {'id':i['id'], 'channelCode': nodeCode}
                 swip_time = i['swingTime']
                 e_type = i['enterOrExit']
-                cls.swipe_next(nodeCode, id_number, swip_time, e_type, detail)
+                cls.swipe_next(nodeCode, id_number, swip_time, e_type, i)
     
     @classmethod
     def swipe_next(cls, nodeCode: str, id_number: str, swip_time: str, e_type:int, detail:dict):
@@ -280,6 +278,7 @@ class HrmService:
             else:
                 cr = ClockRecord()
             cr.type = card_type
+            cr.exception_type = None
             cr.employee = ep
             cr.trigger = trigger
             cr.detail = detail
diff --git a/apps/hrm/tasks.py b/apps/hrm/tasks.py
index ac4c28a9..36bb03ac 100755
--- a/apps/hrm/tasks.py
+++ b/apps/hrm/tasks.py
@@ -50,11 +50,7 @@ def correct_swip_task(start_time="", end_time=""):
     _, res = dhClient.request(**dhapis['swipe_list'], json=data)
     for i in res['pageData']:
         if 'paperNumber' in i:
-            detail = {
-                'id': i['id'],
-                'channelCode': i['channelCode']
-            }
-            HrmService.swipe_next(i['channelCode'], i['paperNumber'], i['swingTime'], i['enterOrExit'], detail)
+            HrmService.swipe_next(i['channelCode'], i['paperNumber'], i['swingTime'], i['enterOrExit'], i)
     # ClockRecord.objects.filter(type=30).delete()
 
 @shared_task