Merge branch 'Test_IRC_Net10' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net10

IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs

@@ -14,7 +14,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         [NotDefault]
         public Guid TrialReadingCriterionId { get; set; }
 
-        [NotDefault]
         public decimal VisitNum { get; set; }
 
         public Guid? ReadingQuestionId { get; set; }
@@ -25,7 +24,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         [NotDefault]
         public Guid TrialReadingCriterionId { get; set; }
 
-        [NotDefault]
         public decimal VisitNum { get; set; }
 
         public List<TrialQuestionVisitJudgeRuleItemDto> QuestionList { get; set; } = new List<TrialQuestionVisitJudgeRuleItemDto>();
@@ -820,6 +818,9 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// 裁判任务生成
         /// </summary>
         public JudgeGenerate JudgeGenerateEnum { get; set; } = JudgeGenerate.Instant;
+
+        public bool IsSigned { get; set; } = false;
+
     }
 
     public enum NeedSynchronize

IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingCriterionService.cs

@@ -374,7 +374,7 @@ namespace IRaCIS.Core.Application.Service.RC
                 JudgeModeEnum = x.JudgeModeEnum,
                 JudgeRuleEnum = x.JudgeRuleEnum,
                 JudgeGenerateEnum = x.JudgeGenerateEnum,
-
+                IsSigned = x.IsSigned,
             }).FirstNotNullAsync();
 
             return result;

IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs

@@ -1,3 +1,4 @@
+using DocumentFormat.OpenXml.Office.SpreadSheetML.Y2023.MsForms;
 using IRaCIS.Core.Application.Contracts;
 using IRaCIS.Core.Application.Service.Reading.Dto;
 using IRaCIS.Core.Domain.Share;
@@ -58,6 +59,12 @@ namespace IRaCIS.Core.Application.Service
                     ReadingQuestionTrialId = x.Id,
                     QuestionName = x.QuestionName.LanguageName(x.QuestionEnName, _userInfo.IsEn_Us),
                     ShowOrder = x.ShowOrder,
+                    Type = x.Type,
+                    TypeValue = x.TypeValue,
+                    QuestionGenre = x.QuestionGenre,
+                    DictionaryCode = x.DictionaryCode,
+                    Unit = x.Unit,
+                    CustomUnit = x.CustomUnit,
                 })
                 .ToListAsync();