From dfd87708da38fcd0f8cb198a5bfb9ba5baef87ad Mon Sep 17 00:00:00 2001 From: zty Date: Fri, 17 May 2024 14:58:44 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E7=BB=9F=E8=AE=A1=E5=8F=82=E4=B8=8E?= =?UTF-8?q?=E8=80=83=E8=AF=95=E5=92=8C=E6=8F=90=E4=BA=A4=E8=80=83=E8=AF=95?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/apps/exam/serializers.py | 10 +++++++++- server/server/settings_dev.py | 29 ++++++++++------------------- 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/server/apps/exam/serializers.py b/server/apps/exam/serializers.py index 9bce0ac..03dc455 100644 --- a/server/apps/exam/serializers.py +++ b/server/apps/exam/serializers.py @@ -87,10 +87,12 @@ class ExamListSerializer(ModelSerializer): paper_ = PaperSerializer(source='paper', read_only=True) course_ = CourseSerializer(source='course_name', read_only=True) user_count = serializers.SerializerMethodField() + submit_count = serializers.SerializerMethodField() class Meta: model = Exam fields = '__all__' - + + #参与考试的 数量 def get_user_count(self, obj): total_user_count = 0 for p in obj.participant_dep.all(): @@ -98,6 +100,12 @@ class ExamListSerializer(ModelSerializer): total_user_count += user_count return total_user_count+obj.participant_user.count() + # 已经提交的数量 + def get_submit_count(self, obj): + exam = ExamRecord.objects.select_related('exam').filter(exam=obj, is_submited=True) + submit_user = len(set([i.create_by for i in exam])) + return submit_user + class ExamDetailSerializer(ModelSerializer): create_by_name = CharField(source='create_by.name', read_only=True) diff --git a/server/server/settings_dev.py b/server/server/settings_dev.py index e589130..368e8ec 100644 --- a/server/server/settings_dev.py +++ b/server/server/settings_dev.py @@ -10,32 +10,23 @@ DATABASES = { 'PORT': '5432', }, # 'default': { -# 'ENGINE': 'django.db.backends.postgresql', -# 'NAME': 'cma', -# 'USER': 'cma', -# 'PASSWORD': 'cma123', -# 'HOST': '172.16.80.102', -# # 'HOST': '1.203.161.102', -# 'PORT': '5432', -# } + # 'ENGINE': 'django.db.backends.postgresql', + # 'NAME': 'cma', + # 'USER': 'cma', + # 'PASSWORD': 'cma123', + # 'HOST': '172.16.80.102', + # # 'HOST': '1.203.161.102', + # 'PORT': '5432', + # } # 'default': { # 'ENGINE': 'django.db.backends.postgresql', # 'NAME': 'cma', # 'USER': 'cma', # 'PASSWORD': 'cma123', - # #'HOST': '49.232.14.174', - # 'HOST': '127.0.0.1', + # 'HOST': '172.16.80.102', + # # 'HOST': '127.0.0.1', # 'PORT': '5432', # } - # 'default': { - # 'ENGINE': 'django.db.backends.postgresql', - # 'NAME': 'cma', - # 'USER': 'cma', - # 'PASSWORD': 'cma123', - # 'HOST': '127.0.0.1', - # # 'HOST': '1.203.161.102', - # 'PORT': '5432', - # } }