A8多套打包+M4归档+R5多图:存量功能备份
A8 多套交付包(packaging_task.py): - 修复交付包只打第1条混乱note的bug,按ImageCandidate.strategy分A/B/C组 - 每组生独立note_0N夹(6图+文案.txt),同seq留最新去重,老数据兼容 - task74端到端验:3套各6图,独立agent7项交叉验证全过 M4 归档(tasks.py/exports.py/前端): - list_tasks加date_from/date_to/product_id筛选+product_name批量填(防N+1) - 新增exports.py:产品JSON导出+标杆CSV导出(UTF-8 BOM) - 前端HistoryFilters日期/产品筛选+产品列+打回原因红banner - response.py加raise_param_error;独立agent验A1/A2/A9通过 R5 产品多图(product_images.py/020迁移/前端): - product_images表+5端点(上传/列/改场景/设主图/删图) - 生图按ROLE_SCENE_PREFERENCE选对应场景图,回落primary - 前端ProductImageManager多图画廊 R6 账号config拆页(settings/): - 配置页按角色拆/settings(运营+组长+admin)+/config(仅admin) - Key只显末4位不显余额(守红线) 核销表对齐真实代码状态:D1改稿框/M7裂变/E12评图分纠偏为已完成(曾漏回写) 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
@@ -170,16 +170,45 @@ def create_task(
|
||||
def list_tasks(
|
||||
page: int = 1, page_size: int = 20,
|
||||
status: list[str] | None = Query(default=None),
|
||||
date_from: str | None = Query(default=None, description="起始日(YYYY-MM-DD)"),
|
||||
date_to: str | None = Query(default=None, description="结束日(YYYY-MM-DD,含当日)"),
|
||||
product_id: int | None = Query(default=None),
|
||||
current_user: Annotated[CurrentUser, Depends(require_write_permission)] = None,
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
from datetime import datetime, timedelta
|
||||
from app.models.product import Product
|
||||
q = db.query(GenerationTask).filter(GenerationTask.workspace_id == current_user.workspace_id)
|
||||
if status:
|
||||
# 支持多状态(?status=approved&status=rejected),单值也兼容
|
||||
q = q.filter(GenerationTask.status.in_(status))
|
||||
if product_id is not None:
|
||||
q = q.filter(GenerationTask.product_id == product_id)
|
||||
# 日期筛选:date 形参非法 → 40001(不静默吞成全量,防运营误判)
|
||||
try:
|
||||
if date_from:
|
||||
q = q.filter(GenerationTask.created_at >= datetime.fromisoformat(date_from))
|
||||
if date_to:
|
||||
# date_to 含当日:取次日 0 点为开区间上界,覆盖当日全部时刻
|
||||
_end = datetime.fromisoformat(date_to) + timedelta(days=1)
|
||||
q = q.filter(GenerationTask.created_at < _end)
|
||||
except ValueError:
|
||||
from app.core.response import raise_param_error
|
||||
raise_param_error("date_from/date_to 需为 YYYY-MM-DD 格式")
|
||||
total = q.count()
|
||||
items = q.order_by(GenerationTask.created_at.desc()).offset((page - 1) * page_size).limit(page_size).all()
|
||||
return ok(paginate([_fmt_task(t) for t in items], total, page, page_size))
|
||||
# product_name 一次性批量查(防 N+1):收集本页 product_id → id→name dict
|
||||
pids = {t.product_id for t in items if t.product_id}
|
||||
name_map: dict[int, str] = {}
|
||||
if pids:
|
||||
for p in db.query(Product.id, Product.name).filter(Product.id.in_(pids)).all():
|
||||
name_map[p.id] = p.name
|
||||
rows = []
|
||||
for t in items:
|
||||
d = _fmt_task(t)
|
||||
d["product_name"] = name_map.get(t.product_id)
|
||||
rows.append(d)
|
||||
return ok(paginate(rows, total, page, page_size))
|
||||
|
||||
|
||||
@router.get("/{task_id}")
|
||||
|
||||
Reference in New Issue
Block a user