update

@@ -17,12 +17,21 @@ class AuditorSerializer(serializers.ModelSerializer):
 
 
 
 
 class ProjectSerializer(serializers.ModelSerializer):
 class ProjectSerializer(serializers.ModelSerializer):
-	creator = serializers.ReadOnlyField(source='project_creator')
+	# creator = serializers.ReadOnlyField(source='project_creator')
 	# teacher = serializers.ReadOnlyField(source='teacher.username')  # 外键字段 只读
 	# teacher = serializers.ReadOnlyField(source='teacher.username')  # 外键字段 只读
+	# result = serializers.PrimaryKeyRelatedField()
+	result = serializers.ReadOnlyField()
+
+	# @staticmethod
+	# def get_result(obj):
+	# 	result = item.result_project.filter(auditor__user_id=self.request.user.id).values('is_accept').first()
 
 
 	class Meta:
 	class Meta:
 		model = Project
 		model = Project
-		fields = '__all__'
+		fields = (
+			'id', 'result', 'creator', 'category', 'model_type', 'market_share_analysis', 'context_analysis',
+			'attachments', 'create_time'
+		)
 		depth = 1
 		depth = 1
 
 
 
 

@@ -6,7 +6,7 @@ from django.urls import path, include
 from rest_framework import routers
 from rest_framework import routers
 
 
 from .views import AuditorViewSet, ProgramViewSet, AuditorListView, ResultViewSet
 from .views import AuditorViewSet, ProgramViewSet, AuditorListView, ResultViewSet
-from .views_cbv import CreateProject, ProjectDetail, AuditProjectsList, AuditProject
+from .views_cbv import CreateProject, ProjectDetail, AuditProjectsList, AuditProject, CheckAuth
 
 
 router = routers.DefaultRouter()
 router = routers.DefaultRouter()
 router.register(r'auditor', AuditorViewSet, basename="auditor")
 router.register(r'auditor', AuditorViewSet, basename="auditor")
@@ -21,6 +21,7 @@ urlpatterns = [
 	# re_path(r'auditor/<int:pk>', AuditorListView.as_view()),
 	# re_path(r'auditor/<int:pk>', AuditorListView.as_view()),
 	path('create', CreateProject.as_view(), name="create_project"),
 	path('create', CreateProject.as_view(), name="create_project"),
 	path('audit/<int:pk>', AuditProject.as_view(), name="audit_project"),
 	path('audit/<int:pk>', AuditProject.as_view(), name="audit_project"),
+	path('right/<int:pk>', CheckAuth.as_view(), name="check_audit_auth"),
 	path('list', AuditProjectsList.as_view(), name="list_projects"),
 	path('list', AuditProjectsList.as_view(), name="list_projects"),
 	path('<int:pk>', ProjectDetail.as_view(), name="retrieve_project"),
 	path('<int:pk>', ProjectDetail.as_view(), name="retrieve_project"),
 ]
 ]

 # _*_ coding: utf-8 _*_
 # _*_ coding: utf-8 _*_
 # @Time     :   2020/10/7 10:40
 # @Time     :   2020/10/7 10:40
 # @Author       vanwhebin
 # @Author       vanwhebin
+import re
 from rest_framework.generics import CreateAPIView, RetrieveAPIView, UpdateAPIView, ListAPIView
 from rest_framework.generics import CreateAPIView, RetrieveAPIView, UpdateAPIView, ListAPIView
 from rest_framework.permissions import IsAuthenticated, IsAdminUser
 from rest_framework.permissions import IsAuthenticated, IsAdminUser
 from rest_framework.exceptions import ValidationError
 from rest_framework.exceptions import ValidationError
-from django.urls import reverse
+from rest_framework.views import APIView
 from rest_framework.response import Response
 from rest_framework.response import Response
+from django.contrib.auth.decorators import login_required
+from django.views.decorators.http import require_http_methods
 
 
 from .serializers import ProjectSerializer
 from .serializers import ProjectSerializer
+from usercenter.models import User
 from .models import Auditor, Project, Result
 from .models import Auditor, Project, Result
 from utils.helpers import WxPushHelper
 from utils.helpers import WxPushHelper
 from utils.pagination import MyPageNumberPagination
 from utils.pagination import MyPageNumberPagination
 from utils.util import response
 from utils.util import response
+from wxProject.settings import FRONT_URL
+
+AUDITORS = (
+	(2, '邓望明'),
+	(3, '杜波')
+)
 
 
 
 
 class CreateProject(CreateAPIView):
 class CreateProject(CreateAPIView):
@@ -23,13 +33,15 @@ class CreateProject(CreateAPIView):
 		wx_client = WxPushHelper()
 		wx_client = WxPushHelper()
 		serializer = ProjectSerializer(data=request.data)
 		serializer = ProjectSerializer(data=request.data)
 		if not serializer.is_valid():
 		if not serializer.is_valid():
-			raise ValidationError
+			raise ValidationError(serializer.errors)
 		else:
 		else:
 			serializer.save(creator=request.user, auditor=Auditor.objects.order_by('-order').all())
 			serializer.save(creator=request.user, auditor=Auditor.objects.order_by('-order').all())
 			# 企业微信推送
 			# 企业微信推送
 			obj_dict = serializer.data
 			obj_dict = serializer.data
-			wx_client.push_card(request.user.wx_token,
-			                    reverse("project:retrieve_project", kwargs={"pk": obj_dict['id']}), u"流程创建成功")
+			url = re.sub("PK", obj_dict['id'], FRONT_URL['flow_detail'])
+			first_auditor = User.objects.filter(pk=AUDITORS[0][0]).first()
+			wx_client.push_card(first_auditor.wx_token, url, f"{request.user.username}提交了一个产品立项申请")
+			wx_client.push_card(request.user.wx_token, url, u"流程创建成功")
 			return response(obj_dict)
 			return response(obj_dict)
 
 
 
 
@@ -38,7 +50,9 @@ class ProjectDetail(RetrieveAPIView):
 	serializer_class = ProjectSerializer
 	serializer_class = ProjectSerializer
 	permission_classes = (IsAuthenticated,)
 	permission_classes = (IsAuthenticated,)
 
 
-	# def get_object(self):
+	def get(self, request, *args, **kwargs):
+		obj = self.get_object()
+		return response(ProjectSerializer(obj).data)
 
 
 
 
 class AuditProject(UpdateAPIView):
 class AuditProject(UpdateAPIView):
@@ -81,6 +95,7 @@ class AuditProject(UpdateAPIView):
 
 
 			wx_client = WxPushHelper()
 			wx_client = WxPushHelper()
 			full_audit_done = self._check_audit(obj)
 			full_audit_done = self._check_audit(obj)
+			url = re.sub("PK", obj.id, FRONT_URL['flow_detail'])
 			desc = "产品立项流程所有审批已完成" if full_audit_done else f"{request.user.username}已审批完成"
 			desc = "产品立项流程所有审批已完成" if full_audit_done else f"{request.user.username}已审批完成"
 			if full_audit_done:
 			if full_audit_done:
 				obj.is_done = True
 				obj.is_done = True
@@ -89,20 +104,45 @@ class AuditProject(UpdateAPIView):
 				if not accept_param:
 				if not accept_param:
 					obj.is_done = True
 					obj.is_done = True
 					obj.is_pass = False
 					obj.is_pass = False
+				else:
+					second_auditor = User.objects.filter(pk=AUDITORS[1][0]).first()
+					wx_client.push_card(second_auditor.wx_token, url, f"{request.user.username}提交了一个产品立项申请")
 			obj.save()
 			obj.save()
-			wx_client.push_card(obj.creator.wx_token, reverse("project:retrieve_project", kwargs={"pk": obj.id}), desc)
+			wx_client.push_card(obj.creator.wx_token, url, desc)
 
 
 		return response(ProjectSerializer(obj).data)
 		return response(ProjectSerializer(obj).data)
 
 
 
 
 class AuditProjectsList(ListAPIView):
 class AuditProjectsList(ListAPIView):
+	queryset = Project.objects.all()
 	serializer_class = ProjectSerializer
 	serializer_class = ProjectSerializer
 	pagination_class = MyPageNumberPagination
 	pagination_class = MyPageNumberPagination
 	permission_classes = (IsAuthenticated, IsAdminUser)
 	permission_classes = (IsAuthenticated, IsAdminUser)
 
 
-	def get_queryset(self, **kwargs):
-		return Project.objects.filter(auditor__user_id=kwargs['user'].id)
+	def get_queryset(self):
+		# auditor = Auditor.objects.get(user=self.request.user)
+		# sql = Project.objects.filter(
+		# 	auditor__user_id=self.request.user.id,
+		# 	auditor__result_auditor__exact=auditor) \
+		# 	.order_by('-is_done')
+		data = Project.objects.filter(auditor__user_id=self.request.user.id).order_by('-is_done')
+		for item in data:
+			result = item.result_project.filter(auditor__user_id=self.request.user.id).values('is_accept').first()
+			item.result = result['is_accept'] if result else False
+		# print(data.query)
+		return data
+#
+# def get(self, request, *args, **kwargs):
+# 	qs = self.get_queryset(user=request.user, **kwargs)
+# 	return response(ProjectSerializer(qs, many=True).data)
+
+
+class CheckAuth(APIView):
+	""" 检查是否有权限进行审批 """
+	allowed_methods = ('GET',)
+	permission_classes = (IsAuthenticated, IsAdminUser)
 
 
-	def get(self, request, *args, **kwargs):
-		qs = self.get_queryset(user=request.user)
-		return response(ProjectSerializer(qs, many=True).data)
+	@staticmethod
+	def get(request, *args, **kwargs):
+		project_auditor = Project.objects.filter(pk=kwargs['pk'], auditor__user_id=request.user.id)
+		return response(True) if project_auditor else response(False)

+media

@@ -25,11 +25,11 @@ class UploadMedia(CreateAPIView):
 		uploaded_file.name = uploaded_file.name.strip('"')
 		uploaded_file.name = uploaded_file.name.strip('"')
 
 
 		if not uploaded_file:
 		if not uploaded_file:
-			return response(u"文件上传失败", status=status.HTTP_400_BAD_REQUEST)
+			return response(msg=u"文件上传失败", status_code=status.HTTP_400_BAD_REQUEST)
 		ext_pos = uploaded_file.name.rfind('.')
 		ext_pos = uploaded_file.name.rfind('.')
 		uploaded_file_ext = uploaded_file.name[ext_pos:]
 		uploaded_file_ext = uploaded_file.name[ext_pos:]
 		if not self.allowed_extension(uploaded_file_ext):
 		if not self.allowed_extension(uploaded_file_ext):
-			return response({"msg": "非法文件类型"}, status=status.HTTP_400_BAD_REQUEST)
+			return response(msg="非法文件类型", status_code=status.HTTP_400_BAD_REQUEST)
 		hash_file_name = uuid() + uploaded_file_ext
 		hash_file_name = uuid() + uploaded_file_ext
 		time_tag = time.strftime('%Y-%m-%d')
 		time_tag = time.strftime('%Y-%m-%d')
 		file_path = time_tag + os.sep + hash_file_name
 		file_path = time_tag + os.sep + hash_file_name

@@ -33,7 +33,7 @@ def response(data="", status_code=status.HTTP_200_OK, code=0, **kwargs):
         "data": data,
         "data": data,
     }
     }
     res.update(kwargs)
     res.update(kwargs)
-    return JsonResponse(data=res, status=status_code)
+    return JsonResponse(res, status=status_code)
 
 
 
 
 def save_log(directory, content, log_type=None):
 def save_log(directory, content, log_type=None):

@@ -162,6 +162,8 @@ REST_FRAMEWORK = {
 		'rest_framework.renderers.BrowsableAPIRenderer',
 		'rest_framework.renderers.BrowsableAPIRenderer',
 		# 'rest_framework_csv.renderers.CSVRenderer',
 		# 'rest_framework_csv.renderers.CSVRenderer',
 	),
 	),
+	'DEFAULT_PAGINATION_CLASS': 'utils.pagination.MyPageNumberPagination',
+	'PAGE_SIZE': 10,
 	'DATETIME_FORMAT': "%Y-%m-%d %H:%M:%S"
 	'DATETIME_FORMAT': "%Y-%m-%d %H:%M:%S"
 
 
 }
 }
@@ -173,3 +175,7 @@ SIMPLE_JWT = {
 	'SLIDING_TOKEN_LIFETIME': timedelta(minutes=5),
 	'SLIDING_TOKEN_LIFETIME': timedelta(minutes=5),
 	'SLIDING_TOKEN_REFRESH_LIFETIME': timedelta(days=1),
 	'SLIDING_TOKEN_REFRESH_LIFETIME': timedelta(days=1),
 }
 }
+
+FRONT_URL = {
+	"flow_detail": "http://project.tacklifetools.com/project/audit/PK"
+}