增删了enroll模型的字段,变更了类名的命名

.idea/dataSources.local.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="dataSourceStorageLocal">
+  <component name="dataSourceStorageLocal" created-in="PY-221.5080.212">
     <data-source name="ITStudio@localhost" uuid="f9570fba-eba2-4840-bc3f-b898c3fabd4c">
       <database-info product="" version="" jdbc-version="" driver-name="" driver-version="" dbms="MYSQL" exact-version="0" />
       <secret-storage>forget</secret-storage>

Apps/enroll/models.py

@@ -27,27 +27,42 @@ class NewMember(models.Model):
         verbose_name_plural = u"报名信息"
 
     schedules = [
-        (0, "尚未提交"),
         (1, "已报名"),
         (2, "初审中"),
         (3, "面试中"),
         (4, "笔试中"),
         (5, "成功录取"),
-        (-1, "初审失败"),
+        (6, "初审失败"),
-        (-2, "面试失败"),
+        (7, "面试失败"),
-        (-3, "笔试失败"),
+        (8, "笔试失败"),
-        (-4, "复试失败"),
+        (9, "复试失败"),
-        (-5, "未录取")
+        (10, "未录取")
+    ]
+    departments = [
+        (0, "系统维护"),
+        (1, "APP开发"),
+        (2, "Web开发"),
+        (3, "程序开发"),
+        (4, "游戏开发"),
+        (5, "UI设计")
+    ]
+    sex = [
+        (0, "男"),
+        (1, "女"),
+        (2, "保密")
     ]
     name = models.CharField(max_length=20, verbose_name="姓名")
+    sex = models.SmallIntegerField(choices=sex, default=2, verbose_name="性别")
     major = models.CharField(max_length=20, verbose_name="年级专业")
     phone_number = models.CharField(max_length=11, unique=True, verbose_name="手机号码")
     email = models.EmailField(unique=True, verbose_name="邮箱")
-    department = models.CharField(max_length=10, verbose_name="意向部门")
+    department = models.SmallIntegerField(choices=departments, default=0,
-    expectation = models.CharField(max_length=10, verbose_name="期待的话")
+                                          verbose_name="意向部门")
-    schedule = models.SmallIntegerField(choices=schedules, default=0, verbose_name="报名状态")
+    expectation = models.TextField(max_length=200, verbose_name="期待的话")
+    status = models.SmallIntegerField(choices=schedules, default=0, verbose_name="报名状态")
+
     # verification_code = models.ForeignKey("EmailVerifyRecord", on_delete=models.DO_NOTHING, verbose_name="邮箱验证码")
-    verification_code = models.CharField(max_length=4)
+    # verification_code = models.CharField(max_length=4)
 
     def __str__(self):
         return self.name

Apps/enroll/serializers.py

@@ -5,7 +5,7 @@ import time
 from utils.get_error_msg import get_error_msg
 
 
-class department_serializer(serializers.ModelSerializer):
+class DepartmentSerializer(serializers.ModelSerializer):
     """获取部门信息"""
 
     class Meta:
@@ -13,7 +13,7 @@ class department_serializer(serializers.ModelSerializer):
         fields = "__all__"
 
 
-class new_member_serializer(serializers.ModelSerializer):
+class NewMemberSerializer(serializers.ModelSerializer):
     """用于添加新成员时的校验与序列化"""
 
     # verification_code = serializers.CharField(source="verification_code.code")
@@ -51,7 +51,7 @@ class new_member_serializer(serializers.ModelSerializer):
         }
 
 
-class new_member_schedule_serializer(serializers.ModelSerializer):
+class NewMemberScheduleSerializer(serializers.ModelSerializer):
     """获取成员录取状态信息的序列化器"""
 
     class Meta:
@@ -59,7 +59,7 @@ class new_member_schedule_serializer(serializers.ModelSerializer):
         fields = ["name", "email", "schedule"]
 
 
-class send_email_serializer(serializers.Serializer):
+class SendEmailSerializer(serializers.Serializer):
     """发送邮件时校验用序列化器"""
 
     # code = serializers.CharField(max_length=10)

Apps/enroll/urls.py

@@ -4,8 +4,8 @@ from . import views
 # from rest_framework.routers import DefaultRouter
 
 urlpatterns = [
-    path("department/", views.department_message.as_view()),
+    path("department/", views.DepartmentMessageView.as_view()),
-    path("sign_up/", views.sign_up.as_view()),
+    path("sign_up/", views.SignUpView.as_view()),
-    path("sign_up/verification_code/", views.send_email.as_view()),
+    path("sign_up/verification_code/", views.SendEmailView.as_view()),
     # path("sign_up/<string:pk>", views.Sign_in.as_view({"get": "get"}))
 ]

Apps/enroll/views.py

@@ -1,8 +1,8 @@
 from rest_framework.response import Response
 from rest_framework.generics import GenericAPIView
 from Apps.enroll.models import Department, EmailVerifyRecord, NewMember
-from Apps.enroll.serializers import department_serializer, new_member_serializer, new_member_schedule_serializer, \
+from Apps.enroll.serializers import DepartmentSerializer, NewMemberSerializer, NewMemberScheduleSerializer, \
-    send_email_serializer
+    SendEmailSerializer
 from rest_framework import status
 from rest_framework.views import APIView
 from Apps.enroll.email import send_code_email
@@ -11,11 +11,11 @@ import re
 import time
 
 
-class department_message(GenericAPIView):
+class DepartmentMessageView(GenericAPIView):
     """获取部门信息"""
 
     queryset = Department.objects.all()
-    serializer_class = department_serializer
+    serializer_class = DepartmentSerializer
 
     def get(self, request):
         serializer = self.get_serializer(instance=self.get_queryset(), many=True)
@@ -25,14 +25,14 @@ class department_message(GenericAPIView):
         return Response({"code": 20000, "msg": get_error_msg("20000"), "data": serializer.data})
 
 
-class sign_up(GenericAPIView):
+class SignUpView(GenericAPIView):
     """
     新成员报名
     post:提交新学员信息
     get:根据邮箱及手机号获取成员录取状态
     """
 
-    serializer_class = new_member_serializer
+    serializer_class = NewMemberSerializer
     queryset = NewMember.objects.all()
 
     def post(self, request):
@@ -76,17 +76,17 @@ class sign_up(GenericAPIView):
                 queryset = self.get_queryset().get(id=-1)
         except NewMember.DoesNotExist:
             return Response({"code": 40000, "msg": get_error_msg(45030)})
-        serializer = new_member_schedule_serializer(instance=queryset)
+        serializer = NewMemberScheduleSerializer(instance=queryset)
 
         return Response({"code": 20000, "msg": get_error_msg(20000), "data": serializer.data})
 
 
-class send_email(APIView):
+class SendEmailView(APIView):
     """发送邮件"""
 
     def post(self, request):
         data = request.data
-        serializer = send_email_serializer(data=data)
+        serializer = SendEmailSerializer(data=data)
         # code_serializer = Code_email_serializer()
         ret = serializer.is_valid()
         if ret: