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

PythonProject/dao/employment_dao.py

@@ -31,12 +31,9 @@ def get_emp_dao(db,stu_id=None,class_id=None,company_name=None,min_salary=None,m
         q = q.filter(Employment_info.salary <= max_salary)
 
     r = q.all()
-    if not r:
-        raise HTTPException(status_code=500,detail='查询异常，没有结果！')
     return r
 
 
-
 def add_emp_dao(o,db):
     try:
         stu = db.query(Student_Model).filter(Student_Model.stu_id == o['stu_id']

PythonProject/dao/student_dao.py

@@ -15,7 +15,6 @@ def add_student_dao(o,db):
         o2 = Student_Model(**o)
         db.add(o2)
         db.commit()
-        db.refresh(o2)  # 回填自增的 stu_id
         return o2
     except IntegrityError:
         db.rollback()
@@ -24,27 +23,30 @@ def add_student_dao(o,db):
         db.rollback()
         return 'error'
 
-def delete_student_dao(stu_id,db):
+def delete_student_dao(stu_id, db):
     try:
-        rows = db.query(Student_Model).filter(Student_Model.stu_id == stu_id,Student_Model.delete_status == 0)\
-            .update({'delete_status':1,'delete_time': datetime.now()})
+        rows = (db.query(Student_Model)
+                .filter(Student_Model.stu_id == stu_id,
+                        Student_Model.delete_status == 0)
+                .update({'delete_status': 1, 'delete_time': datetime.now()}))
         db.commit()
-    except:
-        db.rollback()
-        rows = 0
-    finally:
         return rows
+    except Exception:
+        db.rollback()
+        raise
 
-def update_student_dao(stu_id,update_data,db):
-    if update_data.get('id_card'):
+def update_student_dao(stu_id, update_data, db):
+    if not update_data:
+        return 0
+    id_card = update_data.get('id_card')
+    if id_card:
         conflict = (db.query(Student_Model)
-                    .filter(Student_Model.id_card == update_data['id_card'],
+                    .filter(Student_Model.id_card == id_card,
                             Student_Model.stu_id != stu_id,
                             Student_Model.delete_status == 0)
                     .first())
         if conflict:
             return 'conflict'
-
     try:
         rows = (db.query(Student_Model)
                 .filter(Student_Model.stu_id == stu_id,
@@ -67,17 +69,13 @@ def get_student_dao(stu_id:Optional[int]
                    ,page_size: int
                    ,db
                    ) -> tuple[List[Dict[str, Any]], int]:
-    try:
-        q = db.query(Student_Model).filter(Student_Model.delete_status == 0)
-        if stu_id:
-          q = q.filter(Student_Model.stu_id == stu_id)
-        if stu_name and stu_name.strip() != "":
-          q = q.filter(Student_Model.stu_name.like(f"%{stu_name}%"))
-        if class_id:
-          q= q.filter(Student_Model.class_id == class_id)
-        total = q.count()
-        r = q.offset((page - 1) * page_size).limit(page_size).all()
-        return r,total
-    except:
-        db.rollback()
-        return [],0
+    q = db.query(Student_Model).filter(Student_Model.delete_status == 0)
+    if stu_id:
+        q = q.filter(Student_Model.stu_id == stu_id)
+    if stu_name and stu_name.strip() != "":
+        q = q.filter(Student_Model.stu_name.like(f"%{stu_name}%"))
+    if class_id:
+        q = q.filter(Student_Model.class_id == class_id)
+    total = q.count()
+    r = q.offset((page - 1) * page_size).limit(page_size).all()
+    return r, total