Merge pull request '0922.18:35employment接口合并' (#48) from nanfangyu0824 into main

Reviewed-on: #48

dao/employment.py

@@ -4,14 +4,26 @@ from schemas.employment import EmploymentCreate, EmploymentUpdate, EmploymentRes
 
 
 def create_employment(db, obj_in):
+    # obj_in是Pydantic对象(EmploymentCreate)
     """新增就业信息：一个学生只能存在一条就业记录"""
     try:
         db_obj = Employment(**obj_in.model_dump())
-        db.add(db_obj)                      # add：把对象加入数据库会话，此时还没写入数据库
-        db.commit()                         # commit：提交事务，真正写入mysql数据库
-        db.refresh(db_obj)                  # refresh：从数据库刷新对象，拿到数据库自动生成的id、默认时间等字段
-        return EmploymentResponse.model_validate(db_obj).model_dump()
-        # model_validate：把sqlalchemy ORM对象解析进pydantic响应模型
+        db.add(db_obj)
+        db.commit()
+        db.refresh(db_obj)
+
+        resp = EmploymentResponse(id=db_obj.id
+                                  ,student_id=db_obj.student_id
+                                  ,employment_status=db_obj.employment_status
+                                  ,employment_open_date=db_obj.employment_open_date
+                                  ,offer_date=db_obj.offer_date
+                                  ,company_name=db_obj.company_name
+                                  ,salary=db_obj.salary
+                                  ,remark=db_obj.remark
+                                  ,created_at=db_obj.created_at
+                                  ,updated_at=db_obj.updated_at)
+        return resp.model_dump()
+
     except Exception:
         db.rollback()
         return None
@@ -24,7 +36,18 @@ def get_employment_by_id(db, eid):
                                              ,Employment.is_deleted == 0).first()
         if not db_obj:
             return None
-        return EmploymentResponse.model_validate(db_obj).model_dump()
+
+        resp = EmploymentResponse(id=db_obj.id
+                                  ,student_id=db_obj.student_id
+                                  ,employment_status=db_obj.employment_status
+                                  ,employment_open_date=db_obj.employment_open_date
+                                  ,offer_date=db_obj.offer_date
+                                  ,company_name=db_obj.company_name
+                                  ,salary=db_obj.salary
+                                  ,remark=db_obj.remark
+                                  ,created_at=db_obj.created_at
+                                  ,updated_at=db_obj.updated_at)
+        return resp.model_dump()
     except Exception:
         return None
 
@@ -36,7 +59,18 @@ def get_employment_by_student_id(db, student_id):
                                              ,Employment.is_deleted == 0).first()
         if not db_obj:
             return None
-        return EmploymentResponse.model_validate(db_obj).model_dump()
+
+        resp = EmploymentResponse(id=db_obj.id
+                                  ,student_id=db_obj.student_id
+                                  ,employment_status=db_obj.employment_status
+                                  ,employment_open_date=db_obj.employment_open_date
+                                  ,offer_date=db_obj.offer_date
+                                  ,company_name=db_obj.company_name
+                                  ,salary=db_obj.salary
+                                  ,remark=db_obj.remark
+                                  ,created_at=db_obj.created_at
+                                  ,updated_at=db_obj.updated_at)
+        return resp.model_dump()
     except Exception:
         return None
 
@@ -51,16 +85,26 @@ def get_employment_list(db, company_name=None, salary_min=None, salary_max=None,
             query = query.filter(Employment.salary >= salary_min)
         if salary_max is not None:
             query = query.filter(Employment.salary <= salary_max)
-        # count()统计满足条件总条数，用于分页total
+
         total = query.count()
-        # offset偏移量（跳过多少条），limit每页多少条，执行查询拿到结果列表
         records = query.offset(skip).limit(limit).all()
-        # 列表推导式：循环每一条ORM记录，全部转为字典，得到字典列表
-        dict_list = [EmploymentResponse.model_validate(item).model_dump() for item in records]
-        # 返回字典列表 + 总条数
+
+        dict_list = []
+        for item in records:
+            resp = EmploymentResponse(id=item.id
+                                      ,student_id=item.student_id
+                                      ,employment_status=item.employment_status
+                                      ,employment_open_date=item.employment_open_date
+                                      ,offer_date=item.offer_date
+                                      ,company_name=item.company_name
+                                      ,salary=item.salary
+                                      ,remark=item.remark
+                                      ,created_at=item.created_at
+                                      ,updated_at=item.updated_at)
+            dict_list.append(resp.model_dump())
+
         return dict_list, total
     except Exception:
-        # 异常返回空列表，总条数0
         return [], 0
 
 
@@ -68,15 +112,29 @@ def update_employment(db, eid, obj_in):
     """修改就业信息，只更新传入的字段"""
     try:
         db_obj_raw = db.query(Employment).filter(Employment.id == eid
-                                                ,Employment.is_deleted == 0).first()
+                                                 ,Employment.is_deleted == 0).first()
         if db_obj_raw is None:
             return None
-        update_dict = obj_in.model_dump(exclude_unset=True)# exclude_unset=True：只取出前端实际传过来的字段，不会带上没传的None字段
-        for key, value in update_dict.items():
-            setattr(db_obj_raw, key, value)
+
+        update_dict = obj_in.model_dump(exclude_unset=True)
+        db.query(Employment).filter(Employment.id == eid
+                                    ,Employment.is_deleted == 0).update(update_dict)
+
         db.commit()
         db.refresh(db_obj_raw)
-        return EmploymentResponse.model_validate(db_obj_raw).model_dump()
+
+        resp = EmploymentResponse(id=db_obj_raw.id
+                                  ,student_id=db_obj_raw.student_id
+                                  ,employment_status=db_obj_raw.employment_status
+                                  ,employment_open_date=db_obj_raw.employment_open_date
+                                  ,offer_date=db_obj_raw.offer_date
+                                  ,company_name=db_obj_raw.company_name
+                                  ,salary=db_obj_raw.salary
+                                  ,remark=db_obj_raw.remark
+                                  ,created_at=db_obj_raw.created_at
+                                  ,updated_at=db_obj_raw.updated_at)
+        return resp.model_dump()
+
     except Exception:
         db.rollback()
         return None