颁发证书bug
This commit is contained in:
parent
ffe4e5a4f4
commit
5a1c677d28
|
|
@ -441,7 +441,7 @@ class ConsumerViewSet(ModelViewSet):
|
||||||
companyname = companyname.replace(' ', '')
|
companyname = companyname.replace(' ', '')
|
||||||
#公司同名但两个管理员创建,则认为是两个公司
|
#公司同名但两个管理员创建,则认为是两个公司
|
||||||
if Company.objects.filter(name=companyname, create_admin=request.user).exists():
|
if Company.objects.filter(name=companyname, create_admin=request.user).exists():
|
||||||
companyobj = Company.objects.get(name=companyname, create_admin=request.user)
|
companyobj = Company.objects.filter(name=companyname, create_admin=request.user).first()
|
||||||
else:
|
else:
|
||||||
companyobj = Company.objects.create(name=companyname, create_admin=request.user)
|
companyobj = Company.objects.create(name=companyname, create_admin=request.user)
|
||||||
geo = None
|
geo = None
|
||||||
|
|
|
||||||
|
|
@ -635,6 +635,7 @@ class ExamTestViewSet(PageOrNot, ModelViewSet):
|
||||||
candidate.number='SL'+ str(now.year)[-2:] + str(candidate.pk).zfill(6)
|
candidate.number='SL'+ str(now.year)[-2:] + str(candidate.pk).zfill(6)
|
||||||
candidate.create_admin = request.user
|
candidate.create_admin = request.user
|
||||||
candidate.save()
|
candidate.save()
|
||||||
|
path = None
|
||||||
# 生成word证书
|
# 生成word证书
|
||||||
# path = None
|
# path = None
|
||||||
# if workscope.name in ['放射工作人员(上岗)', '放射工作人员(在岗)']: # 如果是放射工作人员处理方式
|
# if workscope.name in ['放射工作人员(上岗)', '放射工作人员(在岗)']: # 如果是放射工作人员处理方式
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue