zcdsj
/
factory
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refector: clock record detail还是多放一些信息

This commit is contained in:
caoqianming 2023-03-16 00:08:39 +08:00
parent 379f27fe48
commit 7f8d7332aa
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/hrm/services.py
View File

@ -212,10 +212,9 @@ class HrmService:
id_number = data['info']['extend'].get('paperNumber', None) id_number = data['info']['extend'].get('paperNumber', None)
if id_number: if id_number:
nodeCode = data['info']['extend']['acsChannelCode'] nodeCode = data['info']['extend']['acsChannelCode']
detail = {'id':data['info']['extend']['id'], 'channelCode': nodeCode}
swip_time = data['info']['extend']['swingTime'] swip_time = data['info']['extend']['swingTime']
e_type = data['info']['extend']['enterOrExit'] 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 @classmethod
def swipe_offline(cls, data:dict): def swipe_offline(cls, data:dict):
@ -225,10 +224,9 @@ class HrmService:
id_number = i.get('paperNumber', None) id_number = i.get('paperNumber', None)
if id_number: if id_number:
nodeCode = i['acsChannelCode'] nodeCode = i['acsChannelCode']
detail = {'id':i['id'], 'channelCode': nodeCode}
swip_time = i['swingTime'] swip_time = i['swingTime']
e_type = i['enterOrExit'] 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 @classmethod
def swipe_next(cls, nodeCode: str, id_number: str, swip_time: str, e_type:int, detail:dict): def swipe_next(cls, nodeCode: str, id_number: str, swip_time: str, e_type:int, detail:dict):
@ -280,6 +278,7 @@ class HrmService:
else: else:
cr = ClockRecord() cr = ClockRecord()
cr.type = card_type cr.type = card_type
cr.exception_type = None
cr.employee = ep cr.employee = ep
cr.trigger = trigger cr.trigger = trigger
cr.detail = detail cr.detail = detail

6
apps/hrm/tasks.py
View File

@ -50,11 +50,7 @@ def correct_swip_task(start_time="", end_time=""):
_, res = dhClient.request(**dhapis['swipe_list'], json=data) _, res = dhClient.request(**dhapis['swipe_list'], json=data)
for i in res['pageData']: for i in res['pageData']:
if 'paperNumber' in i: if 'paperNumber' in i:
detail = { HrmService.swipe_next(i['channelCode'], i['paperNumber'], i['swingTime'], i['enterOrExit'], i)
'id': i['id'],
'channelCode': i['channelCode']
}
HrmService.swipe_next(i['channelCode'], i['paperNumber'], i['swingTime'], i['enterOrExit'], detail)
# ClockRecord.objects.filter(type=30).delete() # ClockRecord.objects.filter(type=30).delete()
@shared_task @shared_task