update pay ui
This commit is contained in:
20
app.py
20
app.py
@@ -5539,11 +5539,11 @@ def get_events_by_stocks():
|
|||||||
RelatedStock.stock_code.in_(stock_codes)
|
RelatedStock.stock_code.in_(stock_codes)
|
||||||
)
|
)
|
||||||
|
|
||||||
# 日期过滤
|
# 日期过滤(使用 start_time 字段)
|
||||||
if start_date_str:
|
if start_date_str:
|
||||||
try:
|
try:
|
||||||
start_date = datetime.strptime(start_date_str, '%Y-%m-%d')
|
start_date = datetime.strptime(start_date_str, '%Y-%m-%d')
|
||||||
query = query.filter(Event.event_date >= start_date)
|
query = query.filter(Event.start_time >= start_date)
|
||||||
except ValueError:
|
except ValueError:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
@@ -5552,12 +5552,12 @@ def get_events_by_stocks():
|
|||||||
end_date = datetime.strptime(end_date_str, '%Y-%m-%d')
|
end_date = datetime.strptime(end_date_str, '%Y-%m-%d')
|
||||||
# 设置为当天结束
|
# 设置为当天结束
|
||||||
end_date = end_date.replace(hour=23, minute=59, second=59)
|
end_date = end_date.replace(hour=23, minute=59, second=59)
|
||||||
query = query.filter(Event.event_date <= end_date)
|
query = query.filter(Event.start_time <= end_date)
|
||||||
except ValueError:
|
except ValueError:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
# 去重并排序
|
# 去重并排序(使用 start_time 字段)
|
||||||
query = query.distinct().order_by(Event.event_date.desc())
|
query = query.distinct().order_by(Event.start_time.desc())
|
||||||
|
|
||||||
# 限制数量
|
# 限制数量
|
||||||
if limit:
|
if limit:
|
||||||
@@ -5582,15 +5582,15 @@ def get_events_by_stocks():
|
|||||||
events_data.append({
|
events_data.append({
|
||||||
'id': event.id,
|
'id': event.id,
|
||||||
'title': event.title,
|
'title': event.title,
|
||||||
'content': event.content,
|
'description': event.description,
|
||||||
'event_date': event.event_date.isoformat() if event.event_date else None,
|
'event_date': event.start_time.isoformat() if event.start_time else None,
|
||||||
'published_time': event.event_date.strftime('%Y-%m-%d %H:%M:%S') if event.event_date else None,
|
'published_time': event.start_time.strftime('%Y-%m-%d %H:%M:%S') if event.start_time else None,
|
||||||
'source': 'event', # 标记来源为事件系统
|
'source': 'event', # 标记来源为事件系统
|
||||||
'importance': event.importance,
|
'importance': event.importance,
|
||||||
'view_count': event.view_count,
|
'view_count': event.view_count,
|
||||||
'like_count': event.like_count,
|
'hot_score': event.hot_score,
|
||||||
'related_stocks': related_stocks_in_list,
|
'related_stocks': related_stocks_in_list,
|
||||||
'cover_image': event.cover_image,
|
'event_type': event.event_type,
|
||||||
'created_at': event.created_at.isoformat() if event.created_at else None
|
'created_at': event.created_at.isoformat() if event.created_at else None
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user