internal/dao/taskDao.go

@@ -382,13 +382,14 @@ func GetArtistUploadStatsList(req *TaskQueryRequest) ([]*ArtistUploadStatsItem,
 	nowMonth := time.Now().Format("2006-01")
 
 	cte := `WITH latest_bor AS (
-  SELECT t.*
+  SELECT bor.*
-  FROM (
+  FROM bundle_order_records bor
-    SELECT bor.*, ROW_NUMBER() OVER(PARTITION BY bor.customer_id ORDER BY bor.created_at DESC, bor.id DESC) AS rn
+  JOIN (
-    FROM bundle_order_records bor
+    SELECT customer_id, MAX(created_at) AS max_created_time
-    WHERE bor.deleted_at IS NULL
+    FROM bundle_order_records
-  ) t
+    GROUP BY customer_id
-  WHERE t.rn = 1
+  ) x ON x.customer_id = bor.customer_id AND x.max_created_time = bor.created_at
+  WHERE bor.deleted_at IS NULL
 ),
 newest_month AS (
   SELECT user_id, MAX(month) AS month
@@ -475,17 +476,7 @@ cvs_agg AS (
 		"JOIN `micro-account`.real_name rn ON rn.id = u.real_name_id\n" +
 		"JOIN latest_bor bor ON bor.customer_id = u.id\n" +
 		"LEFT JOIN balance_sum bs ON bs.user_id = aw.user_id\n" +
-		"LEFT JOIN (\n" +
+		"LEFT JOIN `" + taskSchema + "`.task_management tm ON tm.user_id = aw.user_id AND tm.deleted_at = 0\n" +
-			"  SELECT t.user_id, t.last_task_assignee, t.task_assignee_num\n" +
-			"  FROM `" + taskSchema + "`.task_management t\n" +
-			"  JOIN (\n" +
-			"    SELECT user_id, MAX(updated_at) AS max_updated_at\n" +
-			"    FROM `" + taskSchema + "`.task_management\n" +
-			"    WHERE deleted_at = 0\n" +
-			"    GROUP BY user_id\n" +
-			"  ) x ON x.user_id = t.user_id AND x.max_updated_at = t.updated_at\n" +
-			"  WHERE t.deleted_at = 0\n" +
-			") tm ON tm.user_id = aw.user_id\n" +
 		"LEFT JOIN cw_agg cw ON cw.user_id = aw.user_id\n" +
 		"LEFT JOIN cwa_agg cwa ON cwa.user_id = aw.user_id\n" +
 		"LEFT JOIN cvs_agg cvs ON cvs.user_id = aw.user_id\n" +
@@ -519,7 +510,7 @@ cvs_agg AS (
 		return nil, 0, commonErr.ReturnError(err, "查询总数失败", "查询艺人上传统计总数失败: ")
 	}
 
-	orderClause := "start_at DESC"
+	orderClause := "bor.customer_num ASC"
 	if req != nil && req.SortBy != "" {
 		sortType := req.SortType
 		if sortType != "asc" && sortType != "desc" && sortType != "ASC" && sortType != "DESC" {