update

@@ -4,33 +4,25 @@
 from rest_framework import serializers
 from rest_framework import serializers
 
 
 from .models import Auditor, Project, Result
 from .models import Auditor, Project, Result
-from usercenter.serializers import UserSerializer
 
 
 
 
 class AuditorSerializer(serializers.ModelSerializer):
 class AuditorSerializer(serializers.ModelSerializer):
 
 
 	class Meta:
 	class Meta:
 		model = Auditor
 		model = Auditor
-		# fields = ("user", "leader")
 		fields = '__all__'
 		fields = '__all__'
 		depth = 1
 		depth = 1
 
 
 
 
 class ProjectSerializer(serializers.ModelSerializer):
 class ProjectSerializer(serializers.ModelSerializer):
-	# creator = serializers.ReadOnlyField(source='project_creator')
-	# teacher = serializers.ReadOnlyField(source='teacher.username')  # 外键字段 只读
-	# result = serializers.PrimaryKeyRelatedField()
 	result = serializers.ReadOnlyField()
 	result = serializers.ReadOnlyField()
-
-	# @staticmethod
-	# def get_result(obj):
-	# 	result = item.result_project.filter(auditor__user_id=self.request.user.id).values('is_accept').first()
+	cur_auditor = serializers.ReadOnlyField()
 
 
 	class Meta:
 	class Meta:
 		model = Project
 		model = Project
 		fields = (
 		fields = (
 			'id', 'result', 'creator', 'category', 'model_type', 'market_share_analysis', 'context_analysis',
 			'id', 'result', 'creator', 'category', 'model_type', 'market_share_analysis', 'context_analysis',
-			'attachments', 'create_time'
+			'attachments', 'create_time', "cur_auditor"
 		)
 		)
 		depth = 1
 		depth = 1
 
 

@@ -54,6 +54,13 @@ class ProjectDetail(RetrieveAPIView):
 
 
 	def get(self, request, *args, **kwargs):
 	def get(self, request, *args, **kwargs):
 		obj = self.get_object()
 		obj = self.get_object()
+		auditor_len = Result.objects.filter(project=obj).count()
+		if auditor_len == 2:
+			obj.cur_auditor = "已完结"
+		elif auditor_len == 1:
+			obj.cur_auditor = AUDITORS[1][1]
+		else:
+			obj.cur_auditor = AUDITORS[0][1]
 		return response(ProjectSerializer(obj).data)
 		return response(ProjectSerializer(obj).data)