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 2024-06-11 11:29:00 +08:00
parent af879ca01b 18b0429044
commit 6851dd3f94
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/edu/views.py
View File

@ -169,13 +169,13 @@ class ExamRecordViewSet(ListModelMixin, DestroyModelMixin, RetrieveModelMixin, C
serializer = ExamRecordSubmitSerializer(data = request.data) serializer = ExamRecordSubmitSerializer(data = request.data)
serializer.is_valid(raise_exception=True) serializer.is_valid(raise_exception=True)
vdata = serializer.validated_data vdata = serializer.validated_data
questions_ = vdata['detail_'] detail = vdata['detail']
# 后端判卷 # 后端判卷
ads = AnswerDetail.objects.select_related('question').filter(examrecord=er).order_by('id') ads = AnswerDetail.objects.select_related('question').filter(examrecord=er).order_by('id')
total_score = 0 total_score = 0
try: try:
for index, ad in enumerate(ads): for index, ad in enumerate(ads):
ad.user_answer = questions_[index]['user_answer'] ad.user_answer = detail[index]['user_answer']
if ad.question.type == '多选': if ad.question.type == '多选':
if set(ad.question.right) == set(ad.user_answer): if set(ad.question.right) == set(ad.user_answer):
ad.is_right = True ad.is_right = True

2
apps/utils/tasks.py
View File

@ -18,7 +18,7 @@ def send_mail_task(**args):
settings.SYS_NAME, settings.SYS_VERSION, config['base']['base_name_short'], subject) settings.SYS_NAME, settings.SYS_VERSION, config['base']['base_name_short'], subject)
args['from_email'] = args.get('from_email', settings.EMAIL_HOST_USER) args['from_email'] = args.get('from_email', settings.EMAIL_HOST_USER)
args['recipient_list'] = args.get( args['recipient_list'] = args.get(
'recipient_list', [settings.EMAIL_HOST_USER]) 'recipient_list', settings.EMAIL_DEVELOPERS if hasattr(settings, 'EMAIL_DEVELOPERS') else [settings.EMAIL_HOST_USER])
cache_key = f'error_mail_{subject}' cache_key = f'error_mail_{subject}'
email_tuple = cache.get(cache_key) email_tuple = cache.get(cache_key)
if email_tuple is None: if email_tuple is None: