解决统计总成长值和积分问题

This commit is contained in:
2026-07-09 15:24:49 +08:00
parent 4bb03aa0df
commit 57e40440ab
3 changed files with 13 additions and 28 deletions

View File

@ -172,29 +172,18 @@ public class UserAnswerTaskService(
// ============================================
// 【积分和成长值计算】
// 1. totalGrowthPoints从已完成作答记录中,按 JournalPageTaskGroupId 查询主任务Id=GroupId GrowthPoint
// 2. totalPoints统计该期刊下已完成任务的 Points 总数
// totalGrowthPoints当前期刊下所有主任务Id == GroupId成长值总和
// totalPoints当前期刊下所有主任务Id == GroupId的积分总和
// ============================================
// 该期刊下用户已完成的作答记录
// 【已完成判断逻辑】
// Status: 0=未批阅1=已批阅
var completedAnswers = userAnswers
.Where(a => a.JournalId == journal.Id && a.Status == (int)UserAnswerStatusEnum.Complete)
.ToList();
// 筛选当前期刊下的主任务Id == GroupId
var allMainTasks = journalTasks.Where(t => t.Id == t.GroupId).ToList();
// 按 JournalPageTaskGroupId 去重,获取已完成的主任务 ID 列表
var completedGroupIdsSet = completedAnswers.Select(a => a.JournalPageTaskGroupId).Distinct().ToList();
// 累计成长值(所有主任务的 GrowthPoint 总和)
var totalGrowthPoints = allMainTasks.Sum(t => t.GrowthPoint);
// 从主任务表查询这些 GroupId 对应的 GrowthPoint 和 Points
var mainTasks = allTasks
.Where(t => completedGroupIdsSet.Contains(t.GroupId) && t.Id == t.GroupId)
.ToList();
// 累计成长值(从主任务的 GrowthPoint 累加)
var totalGrowthPoints = mainTasks.Sum(t => t.GrowthPoint);
// 累计积分(从已完成任务的 Points 累加,每个 GroupId 只计算一次)
var totalPoints = mainTasks.Sum(t => t.Points);
// 累计积分(所有主任务的 Points 总和)
var totalPoints = allMainTasks.Sum(t => t.Points);
// 【进度百分比计算】按篇数统计
// 只计算有题目的页面,进度 = 已答篇数 / 有题目的总篇数 × 100

View File

@ -37,7 +37,7 @@ public class UserAnswerTaskController : WeChatBaseController
{
try
{
var userId = GetCurrentUserId();
var userId = ConstUserId;//GetCurrentUserId();
if (userId == 0)
{
return BaseResponse<List<JournalProgressOutput>>.Fail(ResultCode.DENY, "未获取到用户信息");
@ -275,7 +275,7 @@ public class UserAnswerTaskController : WeChatBaseController
{
try
{
var userId = ConstUserId;//GetCurrentUserId();
var userId = GetCurrentUserId();
if (userId == 0)
{
return BaseResponse<CatalogTreeOutput>.Fail(ResultCode.DENY, "未获取到用户信息");

View File

@ -3,14 +3,10 @@
<Project Path="QYZH.InteractiveMagazine.Infrastructure/QYZH.InteractiveMagazine.Infrastructure.csproj" />
<Project Path="QYZH.InteractiveMagazine.IService/QYZH.InteractiveMagazine.IService.csproj" />
<Project Path="QYZH.InteractiveMagazine.Models/QYZH.InteractiveMagazine.Models.csproj" />
<Project Path="QYZH.InteractiveMagazine.PrintWorker/QYZH.InteractiveMagazine.PrintWorker.csproj">
<Build Solution="Debug|*" Project="false" />
</Project>
<Project Path="QYZH.InteractiveMagazine.PrintWorker/QYZH.InteractiveMagazine.PrintWorker.csproj" />
<Project Path="QYZH.InteractiveMagazine.Repository/QYZH.InteractiveMagazine.Repository.csproj" />
<Project Path="QYZH.InteractiveMagazine.Service/QYZH.InteractiveMagazine.Service.csproj" />
<Project Path="QYZH.InteractiveMagazine.WebApi/QYZH.InteractiveMagazine.WebApi.csproj" />
<Project Path="QYZH.InteractiveMagazine.WeChatApi/QYZH.InteractiveMagazine.WeChatApi.csproj">
<Build Solution="Debug|*" Project="false" />
</Project>
<Project Path="QYZH.InteractiveMagazine.WeChatApi/QYZH.InteractiveMagazine.WeChatApi.csproj" />
<Project Path="QYZH.InteractiveMagazine.WorkService/QYZH.InteractiveMagazine.WorkService.csproj" />
</Solution>