Merge remote-tracking branch 'origin/conding' into conding

PythonProject/schema/employment_schema.py

@@ -3,7 +3,7 @@ from pydantic import BaseModel, field_validator
 from datetime import date
 from typing import Optional
 
-class EmlpoymentRequest(BaseModel):
+class EmploymentRequest(BaseModel):
     stu_id: int=Query(ge=1)
     email: str|None
     employment_opening_date:date

PythonProject/schema/statistics_schema.py

@@ -0,0 +1,15 @@
+from pydantic import BaseModel
+
+class AllStuResponse(BaseModel):
+    class_id: int
+    gender: str | None
+    cnt: int
+
+class AcgScoreResponse(BaseModel):
+    class_id: int
+    avg_score: float
+
+class AvgDayResponse(BaseModel):
+    class_id: int
+    avg_days: str | None
+

PythonProject/schema/student_schema.py

@@ -1,5 +1,5 @@
 from datetime import date
-from typing import Self
+from typing import Self,List
 from pydantic import BaseModel, field_serializer, field_validator,model_validator
 
 
@@ -10,12 +10,12 @@ class StudentRequest(BaseModel):
     age:int |None = None
     gender:str |None = None
     native_place:str |None = None
-    birthday:date
+    birthday:date |None = None
     school:str |None = None
     major:str |None = None
     degree:str |None = None
-    admission_date:date
-    graduation_date:date
+    admission_date:date |None = None
+    graduation_date:date |None = None
     @field_validator('age')
     @classmethod
     def check_age(cls, v):
@@ -51,16 +51,32 @@ class StudentResponse(BaseModel):
 class StugetResponse(BaseModel):
     code:int = 200
     detail:str = 'ok'
+    class_id: int | None = None
+    stu_name: str | None = None
+    age: int | None = None
+    gender: str | None = None
+    native_place: str | None = None
+    birthday: date | None = None
+    school: str | None = None
+    major: str | None = None
+    degree: str | None = None
+    admission_date: date | None = None
+    graduation_date: date | None = None
+    progress: int = 0
+
+    @field_serializer('progress')
+    def int_to_string(cls, progress: int):
+        d1 = {
+            0: '学习中',
+            1: '求职中',
+            2: '已就业'
+        }
+        return d1.get(progress, '暂不明确')
+
+class StudentPageResponse(BaseModel):
+    code: int = 200
+    detail: str = "ok"
     page: int
     page_size: int
-    class_id: int
-    stu_name: str
-    age: int
-    gender: str
-    native_place: str
-    birthday: date
-    school: str
-    major: str
-    degree: str
-    admission_date: date
-    graduation_date: date
+    total: int
+    data: List[StugetResponse]

PythonProject/schema/teacher_schema.py

@@ -1,27 +1,17 @@
-from datetime import date
 from pydantic import BaseModel
-# from pydantic.v1 import BaseModel
-from datetime import datetime
+
 
 class Teacher_RequestModel(BaseModel):
     teac_name:str
     teac_gender:str
     teac_age:int
     teac_position:str
-    delete_status:int
 
 class Teacher_ResponseModel(BaseModel):
     code:int=200
     detail:str='OK!'
     teac_name:str
-    totals:int=0
-    data:str|list|tuple|dict
-
-
-
-
-
-
-
-
+    teac_gender:str
+    teac_age:int
+    teac_position:str