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

解决冲突

Browse Source
This commit is contained in:
德武 黄
2026-07-01 08:51:41 +08:00
parent c43517969d
commit 2ca2a4c114
3 changed files with 14 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
QYZH.InteractiveMagazine.Models/Enum/AnswerStatusEnum.cs
View File

@ -3,38 +3,26 @@
namespace QYZH.InteractiveMagazine.Models.Enum namespace QYZH.InteractiveMagazine.Models.Enum
{ {
/// <summary> /// <summary>
/// 答题状态枚举: 0-未答题，1-已答题，2-正确，3-半对，4-错误 /// 答题状态枚举: 10-已答题，20-进行中，30-已完成
/// </summary> /// </summary>
public enum AnswerStatusEnum public enum AnswerStatusEnum
{ {
/// <summary>
/// 未答题
/// </summary>
[Description("未答题")]
None = 0,
/// <summary> /// <summary>
/// 已答题 /// 已答题
/// </summary> /// </summary>
[Description("已答题")] [Description("已答题")]
Answer = 1, Answer = 10,
/// <summary> /// <summary>
/// 正确 /// 进行中
/// </summary> /// </summary>
[Description("正确")] [Description("进行中")]
Correct = 2, Processing = 20,
/// <summary> /// <summary>
/// 半对 /// 已完成
/// </summary> /// </summary>
[Description("半对")] [Description("已完成")]
HalfRight = 3, Complete = 30,
/// <summary>
/// 错误
/// </summary>
[Description("错误")]
Error = 4
} }
} }

4
QYZH.InteractiveMagazine.WorkService/Consumers/JournalTaskReceiveConsumer.cs
View File

@ -591,7 +591,7 @@ public class JournalTaskReceiveConsumer(
AnswerUrl = JsonSerializer.Serialize(question.AnswerUrl ?? []), AnswerUrl = JsonSerializer.Serialize(question.AnswerUrl ?? []),
PageAnswerUrl = data.PageAnswerUrl, PageAnswerUrl = data.PageAnswerUrl,
Revision = 0, Revision = 0,
AnswerStatus = (int)UserAnswerStatusEnum.Complete, AnswerStatus = AnswerStatusEnum.Answer,
AnswerStartTime = question.AnswerStartTime, AnswerStartTime = question.AnswerStartTime,
AnswerEndTime = question.AnswerEndTime, AnswerEndTime = question.AnswerEndTime,
AnswerSeconds = question.AnswerTime, AnswerSeconds = question.AnswerTime,
@ -638,7 +638,7 @@ public class JournalTaskReceiveConsumer(
AnswerUrl = answer.AnswerUrl, AnswerUrl = answer.AnswerUrl,
PageAnswerUrl = answer.PageAnswerUrl, PageAnswerUrl = answer.PageAnswerUrl,
Revision = answer.Revision, Revision = answer.Revision,
AnswerStatus = answer.AnswerStatus, AnswerStatus = (int)answer.AnswerStatus,
AnswerStartTime = answer.AnswerStartTime, AnswerStartTime = answer.AnswerStartTime,
AnswerEndTime = answer.AnswerEndTime, AnswerEndTime = answer.AnswerEndTime,
AnswerSeconds = answer.AnswerSeconds, AnswerSeconds = answer.AnswerSeconds,

4
QYZH.InteractiveMagazine.slnx
View File

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