glz/QYZH.InteractiveMagazine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://8.137.159.94:3000/glz/QYZH.InteractiveMagazine

Browse Source
This commit is contained in:
glz
2026-07-09 18:01:41 +08:00
parent 766be485d0 faf40d6e27
commit 685a8aeaec
3 changed files with 13 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
QYZH.InteractiveMagazine.Service/UserAnswerTaskService.cs
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

4
QYZH.InteractiveMagazine.WeChatApi/Controllers/UserAnswerTaskController.cs
View File

@ -26,7 +26,7 @@ public class UserAnswerTaskController : WeChatBaseController
_logger = logger;
}
private const long ConstUserId = 821752253853766;
private const long ConstUserId = 821752253853766; //ConstUserId;//
/// <summary>
/// 获取当前用户的期刊学习进度列表
@ -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, "未获取到用户信息");

8
QYZH.InteractiveMagazine.slnx
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>