更新debug

stu_jiuye/dao.py

@@ -1,3 +1,5 @@
+import like
+
 from model import Employments,Address,Company
 
 
@@ -45,7 +47,8 @@ def add_address_dao(o,db):
 def update_orders_dao(id,update_data,db):
     try: # 数据更新是有返回值的，返回的是影响的行数
         rows = db.query( Employments ).filter( Employments.id == id ).update( update_data )
-    except:
+    except Exception as e:
+        print(f'更新失败，{e}')
         db.rollback()
         return False
     else:
@@ -54,21 +57,25 @@ def update_orders_dao(id,update_data,db):
 
 def get_emp_dao(
         # stuid,
-                   name
+                   stuname
+                    ,compname
                    ,db
                    , min_salary: int = 0
                    , max_salary: int | None = None
                    # ,page
                    # ,page_size
                    ):
-    q = db.query(Employments)\
+    q = db.query(Employments,Company.compname,Address.somewhere)\
         .join(Company,Employments.company_id==Company.id)\
-        .join(Address,Company.address_id==Address.id)
+        .join(Address,Company.address_id==Address.id)\
+        .filter(Employments.is_deleted == 0)
     # if stuid:
     #     q = q.filter( Employments.id == stuid )
 
-    if name:
-        q = q.filter( Employments.stuname == name )
+    if stuname:
+        q = q.filter( Employments.stuname == stuname )
+    if compname:
+        q=q.filter(Company.compname.like(f'%{compname}%'))
     # r = q.offset( (page-1)*page_size ).limit( page_size ).all()
     if min_salary is not None:
         q = q.filter(Employments.salary >= min_salary)
@@ -79,15 +86,16 @@ def get_emp_dao(
         return [ {"id": i.id,
                   'stuname':i.stuname,
                   'stuclass':i.stuclass,
-                 "company_name": i.compname,
-                  "company_id": i.company_id,
+                 "company_name": compname,
+                  "address":somewhere,
+                  # "company_id": i.company_id,
                   "salary":i.salary,
-                 "address_id": i.address_id,
+                 # "address_id": i.address_id,
                   "employment_open_date":i.employment_open_date,
                   "offer_date":i.offer_date,
                  "created_date": i.created_date,
                 "updated_date": i.updated_date,
-                 "is_deleted":i.is_deleted } for i in r ]
+                 "is_deleted":i.is_deleted } for i,compname,somewhere in r ]
 
 
 def delete_orders_dao(id,db):