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

# Conflicts:
#	PythonProject/api/student_api.py
#	PythonProject/dao/statistics_dao.py

PythonProject/schema/cla_schema.py

@@ -1,6 +1,5 @@
 from datetime import date
 from pydantic import BaseModel
-from sqlalchemy import DATETIME
 
 class claRequest(BaseModel):
 
@@ -12,23 +11,16 @@ class claRequest(BaseModel):
 
     class_teacher_id : int|None = None
 
-    Entry_date  : DATETIME
-
-    update_date : DATETIME
-
-    delete_status : int|None = None
-
-    delete_time : DATETIME
-
 class claResponse(BaseModel):
 
-    code:int = 200
+    code: int = 200
 
-    detail:str = 'ok'
+    detail: str = 'ok'
 
-    class_name = str
+    class_name: str | None = None
 
-    head_teacher_id = int
+    head_teacher_id: int | None = None
+
+    class_teacher_id: int | None = None
 
-    class_teacher_id = int
 

PythonProject/schema/employment_schema.py

@@ -1,12 +1,13 @@
 from fastapi import Query,HTTPException
 from pydantic import BaseModel, field_validator
-from datetime import datetime
+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:datetime
-    offer_issuance_date:datetime
+    employment_opening_date:date
+    offer_issuance_date:date
     company_name:str
     company_address:str|None
     salary:float
@@ -21,10 +22,13 @@ class EmlpoymentRequest(BaseModel):
 class EmploymentResponse(BaseModel):
     code:int = 200
     detail:str = 'OK'
+    emp_id:int
     stu_id: int
+    stu_name:Optional[str] = None
+    class_id:int
     email: str | None
-    employment_opening_date: datetime
-    offer_issuance_date: datetime
+    employment_opening_date: date
+    offer_issuance_date: date
     company_name: str
     company_address: str | None
     salary: float

PythonProject/schema/grade_schema.py

@@ -1,10 +1,16 @@
-from datetime import date
-from typing import Self
-from pydantic import BaseModel,Field
+from model.all_model import *
+from pydantic import BaseModel, Field, field_validator
+from fastapi import HTTPException
+
 
 class GradeRequest(BaseModel):
     stu_id:str|None = Field(description="学生编号")
+    exam_order:int = Field(description='考核序次')
+    score:float = Field(description='成绩')
 
-
-
-class GradeResponse(BaseModel):
+class GradeResponse(BaseModel):
+    code: int = 200
+    detail: str = 'OK'
+    stu_id:str
+    exam_order:int
+    score:float

PythonProject/schema/statistics_schema.py

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

PythonProject/schema/teacher_schema.py

@@ -1,6 +1,6 @@
 from datetime import date
-
-from pydantic.v1 import BaseModel
+from pydantic import BaseModel
+# from pydantic.v1 import BaseModel
 from datetime import datetime
 
 class Teacher_RequestModel(BaseModel):