改新buge

Teachers/dao/tea_dao.py

@@ -14,17 +14,15 @@ def add_tea_dao(t,db):
         return True
 
 #更新
-def add_tea_dao(t, db):
+def update_tea_dao(id,t, db):
     try:
-        t1 = Tea(**t)
-        db.add(t1)
-    except Exception as e:
+        row = db.query(Tea).filter(Tea.id == id,Tea.is_delete ==False ).update(t)
+    except:
         db.rollback()
-        print('新增失败原因：', e)
         return False
     else:
         db.commit()
-        return True
+        return row
 
 #查询
 def get_tea_dao(t,db):
@@ -36,7 +34,7 @@ def get_tea_dao(t,db):
     if t.get("sex"):
         query = query.filter(Tea.sex == t.get('sex') )
     if t.get('class_id'):
-        query = query.filter(Tea.class_id == t.get('claa_id') )
+        query = query.filter(Tea.class_id == t.get('class_id') )
     if t.get('sub'):
         query = query.filter(Tea.sub == t.get('sub') )
     if t.get('home_place'):
@@ -49,11 +47,11 @@ def get_tea_dao(t,db):
         query = query.filter(Tea.work_experience == t.get('work_experience') )
     if t.get('education'):
         query = query.filter(Tea.education == t.get('education') )
-    if t.get('college'):
-        query = query.filter(Tea.collage == t.get('college') )
+    if t.get('collage'):
+        query = query.filter(Tea.collage == t.get('collage') )
     r = query.all()
-    return [{'id':i.id,'name':i.name,'class_id':i.class_id,'sub':i.sub,'tea.sex':i.sex,'home_place':i.home_place
-                ,'specialty':i.specialty,'start_time':i.start_time,'work_experience':i.work_experience,'college':i.college} for i in r]
+    return [{'id':i.id,'name':i.name,'class_id':i.class_id,'sub':i.sub,'sex':i.sex,'home_place':i.home_place
+                ,'specialty':i.specialty,'start_time':i.start_time,'work_experience':i.work_experience,'collage':i.collage} for i in r]
 
 #删除
 def delete_tea_dao(id,db):
@@ -64,7 +62,7 @@ def delete_tea_dao(id,db):
     except:
         db.rollback()
         row = 0
-        return
+        return row
     else:
         db.commit()
         return row