From 3af691844b07841f8f4d5b0fadb6e8ab6697b8b2 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Sat, 15 Apr 2023 18:25:19 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20rpj=5Fmember=5Fleave=20=E4=B8=AD?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=BD=93=E5=89=8D=E5=85=A5=E5=8E=82=E9=A1=B9?= =?UTF-8?q?=E7=9B=AEbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/rpm/services.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/apps/rpm/services.py b/apps/rpm/services.py index bd31773c..2a8d5096 100644 --- a/apps/rpm/services.py +++ b/apps/rpm/services.py @@ -60,7 +60,7 @@ def rpj_member_leave(i: Rpjmember): leave_time__max = rpj_qs.aggregate(Max('leave_time'))['leave_time__max'] come_time_min = rpj_qs.aggregate(Min('come_time'))['come_time__min'] rpj_ = rpj_qs.order_by('-create_time').first() - rep.rpj = rpj # 更新当前入厂项目 + rep.rpj = rpj_ # 更新当前入厂项目 rep.save() rpj_dept = rpj_.rparty.dept if ep: @@ -107,7 +107,7 @@ def rpj_member_come(i: Rpjmember): ep.photo = rep.photo ep.job_state = Employee.JOB_ON ep.type = 'remployee' - ep.belong_dept = rpj.rparty.dept + ep.belong_dept = rpj_dept ep.is_deleted = False ep.job_state = 10 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) -def rpj_certificate_in(i: Rpjmember): - for i in Rpjcertificate.objects.filter(rpj_member=i): +def rpj_certificate_in(rpjm: Rpjmember): + for i in Rpjcertificate.objects.filter(rpj_member=rpjm): ct = Certificate.objects.filter(number=i.number, name=i.name).first() if ct: pass else: 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.number = i.number ct.type = i.type