From b28430257cc0a93b5ca68a94eeaf40408afdaed3 Mon Sep 17 00:00:00 2001
From: geyuan <2732801331@qq.com>
Date: Mon, 21 Sep 2026 16:53:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E9=80=BB=E8=BE=91=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Teachers/dao/tea_dao.py     | 9 +++++++--
 Teachers/model/tea_model.py | 4 +---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Teachers/dao/tea_dao.py b/Teachers/dao/tea_dao.py
index 6015b03..20a63a0 100644
--- a/Teachers/dao/tea_dao.py
+++ b/Teachers/dao/tea_dao.py
@@ -1,4 +1,5 @@
 from Teachers.model.tea_model import Tea
+from datetime import datetime
 
 #增加
 def add_tea_dao(t,db):
@@ -15,7 +16,8 @@ def add_tea_dao(t,db):
 #更新
 def update_tea_dao(id,update_data,db):
     try:
-        rows = db.query(Tea).filter(Tea.tea_id == id,Tea.is_delete == False)(update_data)
+        rows = db.query(Tea).filter(Tea.tea_id == id
+                                    ,Tea.is_delete == False).update(update_data)
     except:
         db.rollback()
         return False
@@ -42,10 +44,13 @@ def get_tea_dao(t,db):
 #删除
 def delete_tea_dao(id,db):
     try:
-        row = db.query(Tea).filter(Tea.tea_id == id).delete()
+        row = db.query(Tea).filter(Tea.tea_id == id
+                                   ,Tea.is_delete == False
+                                   ).update({'is_delete':True,'delete_time':datetime.now()})
     except:
         db.rollback()
         row = 0
+        return row
     else:
         db.commit()
         return row
diff --git a/Teachers/model/tea_model.py b/Teachers/model/tea_model.py
index 93a5c02..dd37b1f 100644
--- a/Teachers/model/tea_model.py
+++ b/Teachers/model/tea_model.py
@@ -31,9 +31,7 @@ class Tea(Base):
     update_date = Column(DateTime
                          ,onupdate=datetime.now
                          ,comment='更新时间')
-    delete_data = Column(DateTime
-                         ,onupdate=datetime.now
-                         ,comment='删除时间')
     is_delete = Column(Integer,default=False,comment='是否删除')
+    delete_time = Column(DateTime)