From 379f27fe48894b04ed6b8b13a5263e1be025479d Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Wed, 15 Mar 2023 23:45:11 +0800
Subject: [PATCH] =?UTF-8?q?refector:=20=E5=88=B7=E5=8D=A1=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81=E4=BC=98=E5=8C=96detail=E6=B7=BB=E5=8A=A0channelCode?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/apps/hrm/services.py b/apps/hrm/services.py
index 4be0cb66..1adc9cb0 100755
--- a/apps/hrm/services.py
+++ b/apps/hrm/services.py
@@ -211,8 +211,8 @@ class HrmService:
         """
         id_number = data['info']['extend'].get('paperNumber', None)
         if id_number:
-            detail = {'id':data['info']['extend']['id']}
             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)
@@ -224,8 +224,8 @@ class HrmService:
         for i in data['infoArray']:
             id_number = i.get('paperNumber', None)
             if id_number:
-                detail = {'id':i['id']}
                 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)
diff --git a/apps/hrm/tasks.py b/apps/hrm/tasks.py
index db540888..ac4c28a9 100755
--- a/apps/hrm/tasks.py
+++ b/apps/hrm/tasks.py
@@ -50,7 +50,11 @@ 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:
-            HrmService.swipe_next(i['channelCode'], i['paperNumber'], i['swingTime'], i['enterOrExit'], {'id': i['id']})
+            detail = {
+                'id': i['id'],
+                'channelCode': i['channelCode']
+            }
+            HrmService.swipe_next(i['channelCode'], i['paperNumber'], i['swingTime'], i['enterOrExit'], detail)
     # ClockRecord.objects.filter(type=30).delete()
 
 @shared_task