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

fix: rpj_member_leave 中更新当前入厂项目bug

This commit is contained in:
caoqianming 2023-04-15 18:25:19 +08:00
parent 59e89c19ba
commit 3af691844b
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/rpm/services.py
View File

@ -60,7 +60,7 @@ def rpj_member_leave(i: Rpjmember):
leave_time__max = rpj_qs.aggregate(Max('leave_time'))['leave_time__max'] leave_time__max = rpj_qs.aggregate(Max('leave_time'))['leave_time__max']
come_time_min = rpj_qs.aggregate(Min('come_time'))['come_time__min'] come_time_min = rpj_qs.aggregate(Min('come_time'))['come_time__min']
rpj_ = rpj_qs.order_by('-create_time').first() rpj_ = rpj_qs.order_by('-create_time').first()
rep.rpj = rpj # 更新当前入厂项目 rep.rpj = rpj_ # 更新当前入厂项目
rep.save() rep.save()
rpj_dept = rpj_.rparty.dept rpj_dept = rpj_.rparty.dept
if ep: if ep:
@ -107,7 +107,7 @@ def rpj_member_come(i: Rpjmember):
ep.photo = rep.photo ep.photo = rep.photo
ep.job_state = Employee.JOB_ON ep.job_state = Employee.JOB_ON
ep.type = 'remployee' ep.type = 'remployee'
ep.belong_dept = rpj.rparty.dept ep.belong_dept = rpj_dept
ep.is_deleted = False ep.is_deleted = False
ep.job_state = 10 ep.job_state = 10
ep.save() ep.save()
@ -164,14 +164,16 @@ def rpj_member_come(i: Rpjmember):
HrmService.sync_dahua_employee(ep, old_photo, come_time__min, leave_time__max) HrmService.sync_dahua_employee(ep, old_photo, come_time__min, leave_time__max)
def rpj_certificate_in(i: Rpjmember): def rpj_certificate_in(rpjm: Rpjmember):
for i in Rpjcertificate.objects.filter(rpj_member=i): for i in Rpjcertificate.objects.filter(rpj_member=rpjm):
ct = Certificate.objects.filter(number=i.number, name=i.name).first() ct = Certificate.objects.filter(number=i.number, name=i.name).first()
if ct: if ct:
pass pass
else: else:
ct = Certificate() ct = Certificate()
ct.employee = i.rpj_member.remployee.employee ctm = i.rpj_member.remployee.employee
if ctm:
ct.employee = ctm
ct.name = i.name ct.name = i.name
ct.number = i.number ct.number = i.number
ct.type = i.type ct.type = i.type