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

Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server

This commit is contained in:
caoqianming 2022-10-26 08:42:53 +08:00
parent 12c5aa5996 9fd220f526
commit 6f6ee439d7
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/hrm/serializers.py
View File

@ -60,13 +60,18 @@ class EmployeeCreateUpdateSerializer(CustomModelSerializer):
HrmService.sync_dahua_employee(ep=instance) HrmService.sync_dahua_employee(ep=instance)
return instance return instance
@transaction.atomic
def update(self, instance, validated_data): def update(self, instance, validated_data):
id_number = validated_data['id_number'] id_number = validated_data['id_number']
ret = get_info_from_id(id_number) ret = get_info_from_id(id_number)
validated_data['gender'] = ret['gender'] validated_data['gender'] = ret['gender']
old_photo = instance.photo old_photo = instance.photo
old_job_state = instance.job_state old_job_state = instance.job_state
old_name = instance.name
instance = super().update(instance, validated_data) instance = super().update(instance, validated_data)
if instance.user and instance != old_name:
instance.user.name = instance.name
instance.user.save()
if instance.type == 'remployee': # 如果是相关方 if instance.type == 'remployee': # 如果是相关方
from apps.rpm.services import sync_to_rep from apps.rpm.services import sync_to_rep
sync_to_rep(instance) sync_to_rep(instance)

1
apps/rpm/services.py
View File

@ -66,6 +66,7 @@ def rpj_audit_end(ticket):
ep.type = 'remployee' ep.type = 'remployee'
ep.belong_dept = rpj.rparty.dept ep.belong_dept = rpj.rparty.dept
ep.is_deleted = False ep.is_deleted = False
ep.job_state = 10
ep.save() ep.save()
# 给相关方人员创建账户 # 给相关方人员创建账户
user_e = ep.user user_e = ep.user