论述题

apps/api/admin/exam/views.py

@@ -142,7 +142,7 @@ class ExamLogViewSet(ReadOnlyModelViewSet):
             item = {
                 'id':row['id'],
                 'question': row['detail__question__title'],# 问题
-                'answer': row['detail__question__discuss_answer'], # 正确答案
+                'answer': str(row['detail__question__discuss_answer']), # 正确答案
                 'discuss_answer': row['discuss_answer'], # 学员答案
                 'discuss_scores': row['detail__main__discuss_scores'], # 该题分数
             }

apps/examination/examquestion/serializers.py

@@ -38,6 +38,11 @@ class ExamQuestionSerializer(serializers.ModelSerializer):
         if 'judgment' in self.initial_data:
             validated_data['judgment'] = True if self.initial_data['judgment'] == '1' else False
         validated_data['create_user'] = self.context['request'].user
+        if validated_data['type'] !=5:
+            validated_data['discuss_answer'] = '请输入论述题答案'
+        else:
+            if not validated_data['discuss_answer']:
+                raise CustomError('请输入论述题答案')
         instance = super(ExamQuestionSerializer, self).create(validated_data)
         rows = json.loads(self.initial_data['rows'])
 
@@ -61,6 +66,11 @@ class ExamQuestionSerializer(serializers.ModelSerializer):
     def update(self, instance, validated_data):
         if 'judgment' in self.initial_data:
             validated_data['judgment'] = True if self.initial_data['judgment'] == '1' else False
+        if validated_data['type'] != 5:
+            validated_data['discuss_answer'] = '请输入论述题答案'
+        else:
+            if not validated_data['discuss_answer']:
+                raise CustomError('请输入论述题答案')
         instance = super(ExamQuestionSerializer, self).update(instance, validated_data)
         rows = json.loads(self.initial_data['rows'])
         ExamQuestionOption.objects.filter(main=instance).update(delete=True, right=False)