1

apps/backend/app/services/task_manager.py

@@ -121,13 +121,13 @@ def _verify_task_ownership(
 
 async def get_task_list(user_id: int, site_id: int) -> list[dict]:
     """
-    获取助教的活跃任务列表。
+    获取助教的任务列表（含有效 + 已放弃）。
 
     1. 通过 auth.user_assistant_binding 获取 assistant_id
-    2. 查询 biz.coach_tasks WHERE status='active'
+    2. 查询 biz.coach_tasks WHERE status IN ('active', 'abandoned')
     3. 通过 FDW 读取客户基本信息（dim_member）和 RS 指数
     4. 计算爱心 icon 档位
-    5. 排序：is_pinned DESC, priority_score DESC, created_at ASC
+    5. 排序：abandoned 排最后 → is_pinned DESC → priority_score DESC → created_at ASC
 
     FDW 查询需要 SET LOCAL app.current_site_id。
     """
@@ -135,17 +135,21 @@ async def get_task_list(user_id: int, site_id: int) -> list[dict]:
     try:
         assistant_id = _get_assistant_id(conn, user_id, site_id)
 
-        # 查询活跃任务
+        # 查询有效 + 已放弃任务（abandoned 排最后）
         with conn.cursor() as cur:
             cur.execute(
                 """
                 SELECT id, task_type, status, priority_score, is_pinned,
-                       expires_at, created_at, member_id
+                       expires_at, created_at, member_id, abandon_reason
                 FROM biz.coach_tasks
                 WHERE site_id = %s
                   AND assistant_id = %s
-                  AND status = 'active'
-                ORDER BY is_pinned DESC, priority_score DESC NULLS LAST, created_at ASC
+                  AND status IN ('active', 'abandoned')
+                ORDER BY
+                    CASE WHEN status = 'abandoned' THEN 1 ELSE 0 END ASC,
+                    is_pinned DESC,
+                    priority_score DESC NULLS LAST,
+                    created_at ASC
                 """,
                 (site_id, assistant_id),
             )
@@ -201,7 +205,7 @@ async def get_task_list(user_id: int, site_id: int) -> list[dict]:
         result = []
         for task_row in tasks:
             (task_id, task_type, status, priority_score,
-             is_pinned, expires_at, created_at, member_id) = task_row
+             is_pinned, expires_at, created_at, member_id, abandon_reason) = task_row
 
             info = member_info_map.get(member_id, {})
             rs_score = rs_map.get(member_id, Decimal("0"))
@@ -220,6 +224,7 @@ async def get_task_list(user_id: int, site_id: int) -> list[dict]:
                 "member_phone": info.get("member_phone"),
                 "rs_score": float(rs_score),
                 "heart_icon": heart_icon,
+                "abandon_reason": abandon_reason,
             })
 
         return result
@@ -372,6 +377,7 @@ async def cancel_abandon(task_id: int, user_id: int, site_id: int) -> dict:
                 """
                 UPDATE biz.coach_tasks
                 SET status = 'active',
+                    is_pinned = FALSE,
                     abandon_reason = NULL,
                     updated_at = NOW()
                 WHERE id = %s
@@ -389,7 +395,7 @@ async def cancel_abandon(task_id: int, user_id: int, site_id: int) -> dict:
             )
         conn.commit()
 
-        return {"id": task_id, "status": "active"}
+        return {"id": task_id, "status": "active", "is_pinned": False}
 
     finally:
         conn.close()