From 7c75aec1d5313958372af94d52b768163ddfe268 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E5=89=8D=E6=98=8E?= <909355014@qq.com>
Date: Wed, 24 Aug 2022 13:30:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=B7=E5=8D=A1=E6=9B=B4=E6=96=B0rpj?=
 =?UTF-8?q?=E5=92=8Cvisit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/ecm/service.py  |  4 ++--
 apps/hrm/services.py | 11 ++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/apps/ecm/service.py b/apps/ecm/service.py
index 1f910a4b..f651c7d0 100644
--- a/apps/ecm/service.py
+++ b/apps/ecm/service.py
@@ -542,8 +542,8 @@ def blt_offline(data):
             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()
             if cr_20:
-                if now > cr_20.create_by:
-                    cr_20.create_by = now
+                if now > cr_20.create_time:
+                    cr_20.create_time = now
                     cr_20.trigger = 'location'
                     cr_20.detail = data
                     cr_20.save()
diff --git a/apps/hrm/services.py b/apps/hrm/services.py
index 945baad0..8713f558 100755
--- a/apps/hrm/services.py
+++ b/apps/hrm/services.py
@@ -201,11 +201,6 @@ class HrmService:
         if device:
             id_number = data['info']['extend'].get('paperNumber', None)
             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 data['info']['extend']['enterOrExit'] == "1":
@@ -258,3 +253,9 @@ class HrmService:
                                 ep.is_atwork = False
                                 ep.last_check_time = now
                                 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)