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

label location

This commit is contained in:
曹前明 2022-07-07 18:13:40 +08:00
parent e4c4bb09dd
commit da0e356438
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apps/hrm/services.py
View File

@ -56,7 +56,7 @@ class HrmService:
) )
dhClient.request(**dhapis['person_update'], json=json_data) dhClient.request(**dhapis['person_update'], json=json_data)
# 开人脸卡 长时间 # 开人脸卡 长时间
if ep.job_state in [Employee.JOB_ON] and ep.type == 'employee': if ep.job_state in [Employee.JOB_ON]:
if not ep.third_info.get('dh_face_card', None): if not ep.third_info.get('dh_face_card', None):
dh_face_card = cls.open_face_card(ep=ep, dh_id=dh_id, departmentId=departmentId) dh_face_card = cls.open_face_card(ep=ep, dh_id=dh_id, departmentId=departmentId)
else: else:
@ -107,9 +107,14 @@ class HrmService:
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() now = datetime.now()
startDate = now.strftime("%Y-%m-%d %H:%M:%S") if ep.type == 'employee': # 如果是内部人员
endDate = (datetime(year=now.year+50, startDate = now.strftime("%Y-%m-%d %H:%M:%S")
month=now.month, day=1)).strftime("%Y-%m-%d %H:%M:%S") endDate = (datetime(year=now.year+50,
month=now.month, day=1)).strftime("%Y-%m-%d %H:%M:%S")
elif ep.type == 'remployee':
pass
elif ep.type == 'visitor':
pass
json_data = { json_data = {
"id": cardId, "id": cardId,
"cardNumber": cardNumber, "cardNumber": cardNumber,

3
apps/third/serializers.py
View File

@ -47,9 +47,10 @@ class BindAreaSerializer(serializers.Serializer):
class LabelLocationSerializer(CustomModelSerializer): class LabelLocationSerializer(CustomModelSerializer):
code = serializers.CharField(label='设备唯一标识')
class Meta: class Meta:
model = TDevice model = TDevice
fields = ['type', 'location', 'area', 'areas', 'code', 'name'] fields = ['type', 'location', 'area', 'areas', 'name', 'code']
class BindAreasSerializer(serializers.Serializer): class BindAreasSerializer(serializers.Serializer):