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

刷卡更新rpj和visit

This commit is contained in:
曹前明 2022-08-24 13:30:05 +08:00
parent 890f17c0d0
commit 7c75aec1d5
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/ecm/service.py
View File

@ -542,8 +542,8 @@ def blt_offline(data):
cr_20 = ClockRecord.objects.filter(type=20, employee=ep, create_time__year=now.year, cr_20 = ClockRecord.objects.filter(type=20, employee=ep, create_time__year=now.year,
create_time__month=now.month, create_time__day=now.day).first() create_time__month=now.month, create_time__day=now.day).first()
if cr_20: if cr_20:
if now > cr_20.create_by: if now > cr_20.create_time:
cr_20.create_by = now cr_20.create_time = now
cr_20.trigger = 'location' cr_20.trigger = 'location'
cr_20.detail = data cr_20.detail = data
cr_20.save() cr_20.save()

11
apps/hrm/services.py
View File

@ -201,11 +201,6 @@ class HrmService:
if device: if device:
id_number = data['info']['extend'].get('paperNumber', None) id_number = data['info']['extend'].get('paperNumber', None)
if id_number: # 如果有身份证号 if id_number: # 如果有身份证号
# 先进行相关方/访客项目更新
Visit.objects.filter(type=Visit.V_ENTER, visitors__employee__id_number=id_number).update(
type=Visit.V_WORKING)
Rpj.objects.filter(type=Rpj.RPJ_ENTER, remployees__employee__id_number=id_number).update(
type=Rpj.RPJ_WORKING)
if device.is_clock: if device.is_clock:
# 如果设置为关联考勤 # 如果设置为关联考勤
if data['info']['extend']['enterOrExit'] == "1": if data['info']['extend']['enterOrExit'] == "1":
@ -258,3 +253,9 @@ class HrmService:
ep.is_atwork = False ep.is_atwork = False
ep.last_check_time = now ep.last_check_time = now
ep.save() ep.save()
# 进行相关方/访客项目更新
Visit.objects.filter(state=Visit.V_ENTER, visitors__employee__id_number=id_number).update(
state=Visit.V_WORKING)
Rpj.objects.filter(state=Rpj.RPJ_ENTER, remployees__employee__id_number=id_number).update(
state=Rpj.RPJ_WORKING)