同步门禁时间范围bug

This commit is contained in:
caoqianming 2022-11-15 14:22:08 +08:00
parent 95dbaeee5f
commit d4e2db10f1
2 changed files with 7 additions and 6 deletions

View File

@ -4,6 +4,7 @@ from rest_framework import serializers
from apps.ecm.service import get_ep_default from apps.ecm.service import get_ep_default
from apps.hrm.services import HrmService from apps.hrm.services import HrmService
from apps.utils.fields import MyFilePathField from apps.utils.fields import MyFilePathField
from django.utils import timezone
from apps.utils.serializers import CustomModelSerializer from apps.utils.serializers import CustomModelSerializer
@ -84,7 +85,7 @@ class EmployeeCreateUpdateSerializer(CustomModelSerializer):
# 同时去除门禁授权 # 同时去除门禁授权
if settings.DAHUA_ENABLED and dhClient: if settings.DAHUA_ENABLED and dhClient:
# 如果是正式员工或相关方且有门禁权限: # 如果是正式员工或相关方且有门禁权限:
now = datetime.now() now = timezone.now()
if instance.type in ['employee', 'remployee']: if instance.type in ['employee', 'remployee']:
start_time = None start_time = None
end_time = None end_time = None

View File

@ -119,8 +119,8 @@ class HrmService:
if start_time is None: # 如果时间段未提供,跳过更新操作 if start_time is None: # 如果时间段未提供,跳过更新操作
pass pass
else: else:
startDate = start_time.strftime("%Y-%m-%d %H:%M:%S") startDate = timezone.localtime(start_time).strftime("%Y-%m-%d %H:%M:%S")
endDate = end_time.strftime("%Y-%m-%d %H:%M:%S") endDate = timezone.localtime(end_time).strftime("%Y-%m-%d %H:%M:%S")
json_data = { json_data = {
"cardNumber": cardNumber, "cardNumber": cardNumber,
"startDate": startDate, "startDate": startDate,
@ -133,13 +133,13 @@ class HrmService:
_, res = dhClient.request(**dhapis['card_gen_id']) _, res = dhClient.request(**dhapis['card_gen_id'])
cardId = res['id'] cardId = res['id']
cardNumber = str(ep.id)[3:8] + rannum(5) cardNumber = str(ep.id)[3:8] + rannum(5)
now = datetime.now()
if start_time is None: # 如果未规定时间范围, 默认1小时 if start_time is None: # 如果未规定时间范围, 默认1小时
now = datetime.now()
startDate = now.strftime("%Y-%m-%d %H:%M:%S") startDate = now.strftime("%Y-%m-%d %H:%M:%S")
endDate = (now+timedelta(minutes=60)).strftime("%Y-%m-%d %H:%M:%S") endDate = (now+timedelta(minutes=60)).strftime("%Y-%m-%d %H:%M:%S")
else: else:
startDate = start_time.strftime("%Y-%m-%d %H:%M:%S") startDate = timezone.localtime(start_time).strftime("%Y-%m-%d %H:%M:%S")
endDate = end_time.strftime("%Y-%m-%d %H:%M:%S") endDate = timezone.localtime(end_time).strftime("%Y-%m-%d %H:%M:%S")
json_data = { json_data = {
"id": cardId, "id": cardId,
"cardNumber": cardNumber, "cardNumber": cardNumber,