no message

common/db/db_msg_center.py

@@ -63,7 +63,7 @@ def get_unread_msg_count(db: Session, user_id: int, msg_type_list: dict) -> dict
             elif msg_type == '工作审批':
                 where = and_(MsgCenter.msg_type == '审批消息')
 
-            c1 = db.query(MsgCenter).filter(where).filter(and_(MsgCenter.recv_userid == user_id, MsgCenter.recv_status == 0)).count()
+            c1 = db.query(MsgCenter).filter(where).filter(and_(MsgCenter.del_flag == '0', MsgCenter.recv_userid == user_id, MsgCenter.recv_status == 0)).count()
         
         data.append({"name" : msg_type, "num": c1})
     logger.info(data)

jobs/duty_job.py

@@ -24,6 +24,9 @@ def proc():
         logger.info(datetime.now())
 
         db = get_db_local()
+
+        __duty_old_proc(db)
+        
         __duty_proc(db)
 
         db.close()
@@ -34,6 +37,13 @@ def format_time(time_diff) -> str:
     hours, minutes, seconds = str(time_diff).split(':')
     return str(hours).zfill(2) + ":" + str(minutes).zfill(2)
 
+# 删除今天之前的值班提醒
+def __duty_old_proc(db: Session):
+    theDay = date.today()
+    db.query(MsgCenter).filter(and_(MsgCenter.msg_type == '值班消息', MsgCenter.recv_time < theDay, MsgCenter.del_flag == '0', MsgCenter.recv_status == 0)).update({"del_flag": 1, "update_time": datetime.now()})
+    db.commit()
+
+# 新建今天的值班提醒
 def __duty_proc(db: Session):
     theDay = date.today()
     rows = db.query(DutyShift).filter(and_(DutyShift.shift_date == theDay, DutyShift.del_flag == '0')).all()