解决冲突

QYZH.InteractiveMagazine.Models/Enum/AnswerStatusEnum.cs

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

QYZH.InteractiveMagazine.WorkService/Consumers/JournalTaskReceiveConsumer.cs

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

QYZH.InteractiveMagazine.slnx

@@ -3,7 +3,9 @@
   <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" />
+  <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.Service/QYZH.InteractiveMagazine.Service.csproj" />
   <Project Path="QYZH.InteractiveMagazine.WebApi/QYZH.InteractiveMagazine.WebApi.csproj" />