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

IRaCIS.Core.Application/Service/Common/DTO/InternationalizationViewModel.cs

@@ -17,6 +17,9 @@ namespace IRaCIS.Core.Application.ViewModel
         public DateTime UpdateTime { get; set; }
         public Guid UpdateUserId { get; set; }
 
+
+        public string Version { get; set; }
+
     }
 
     ///<summary>InternationalizationQuery  列表查询参数模型</summary>
@@ -30,6 +33,10 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public string? ValueCN { get; set; }
 
+        public string? Module { get; set; } 
+        //关联版本历史记录表Id
+        public Guid? PublishLogId { get; set; }
+
     }
 
     ///<summary> InternationalizationAddOrEdit  列表查询参数模型</summary>

IRaCIS.Core.Application/Service/Common/InternationalizationService.cs

@@ -100,6 +100,8 @@ namespace IRaCIS.Core.Application.Service
 
             var internationalizationQueryable = _internationalizationRepository
                 .WhereIf(inQuery.Description != null, t => t.Description.Contains(inQuery.Description))
+                 .WhereIf(inQuery.Module != null, t => t.Description.Contains(inQuery.Module))
+                 .WhereIf(inQuery.PublishLogId != null, t => t.PublishLogId==inQuery.PublishLogId)
                 .WhereIf(inQuery.Code != null, t => t.Code.Contains(inQuery.Code))
                 .WhereIf(inQuery.State != null, t => t.State == inQuery.State)
                 .WhereIf(inQuery.InternationalizationType != null, t => t.InternationalizationType == inQuery.InternationalizationType)

IRaCIS.Core.Application/Service/Common/PublishLogService.cs

@@ -60,9 +60,16 @@ namespace IRaCIS.Core.Application.Service
                 VerifyMsg = "发布编号不能重复"
             };
 
+            var verifyExp2 = new EntityVerifyExp<PublishLog>()
+            {
+                VerifyExp = u => u.IsCurrentVersion == addOrEditPublishLog.IsCurrentVersion,
 
+                VerifyMsg = "当前发布版本只允许有一个",
 
-            var entity = await _publishLogRepository.InsertOrUpdateAsync(addOrEditPublishLog, true, verifyExp1);
+                IsVerify=addOrEditPublishLog.IsCurrentVersion==true
+            };
+
+            var entity = await _publishLogRepository.InsertOrUpdateAsync(addOrEditPublishLog, true, verifyExp1, verifyExp2);
 
             return ResponseOutput.Ok(entity.Id.ToString());
 
@@ -93,7 +100,7 @@ namespace IRaCIS.Core.Application.Service
 
         public async Task<List<PublishVersionSelect>> GetPublishVersionSelect()
         {
-            return await _publishLogRepository.ProjectTo<PublishVersionSelect>(_mapper.ConfigurationProvider).OrderByDescending(t => t.State).ToListAsync();
+            return await _publishLogRepository.ProjectTo<PublishVersionSelect>(_mapper.ConfigurationProvider).OrderByDescending(t => t.Version).ToListAsync();
         }
 
     }

IRaCIS.Core.Application/Service/Common/_MapConfig.cs

@@ -66,7 +66,8 @@ namespace IRaCIS.Core.Application.Service
 
             CreateMap<CommonDocument, CommonDocumentAddOrEdit>().ReverseMap();
 
-            CreateMap<Internationalization, InternationalizationView>();
+            CreateMap<Internationalization, InternationalizationView>()
+                 .ForMember(o => o.Version, t => t.MapFrom(u => u.PublishLog.Version));
             CreateMap<Internationalization, InternationalizationAddOrEdit>().ReverseMap();
 
             CreateMap<Internationalization, BatchInternationalizationDto>().ReverseMap();

IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs

@@ -880,7 +880,7 @@ namespace IRaCIS.Core.Application
                            // 前序 不存在 未一致性核查未通过的
                            .Where(t => !t.Subject.SubjectVisitList.Any(sv => sv.CheckState != CheckStateEnum.CVPassed && t.VisitTaskNum > sv.VisitNum))
                            //前序 不存在  未生成任务的访视
-                           .Where(t => c.IsAutoCreate ? !t.Subject.SubjectCriteriaEvaluationVisitFilterList.Where(d => d.TrialReadingCriterionId == t.TrialReadingCriterionId).Any(f => f.IsGeneratedTask == false && t.VisitTaskNum > f.SubjectVisit.VisitNum) : true)
+                           .Where(t => c.IsAutoCreate == false ? !t.Subject.SubjectCriteriaEvaluationVisitFilterList.Where(d => d.TrialReadingCriterionId == t.TrialReadingCriterionId).Any(f => f.IsGeneratedTask == false && t.VisitTaskNum > f.SubjectVisit.VisitNum) : true)
 
                            .Where(y => y.IsFrontTaskNeedSignButNotSign == false && (y.IsNeedClinicalDataSign == false || y.IsClinicalDataSign == true))
                            .Count(t => t.IsUrgent),
@@ -891,7 +891,7 @@ namespace IRaCIS.Core.Application
                           .Where(t => !t.Subject.SubjectVisitList.Any(sv => sv.CheckState != CheckStateEnum.CVPassed && t.VisitTaskNum > sv.VisitNum))
                           //前序 不存在  未生成任务的访视
                           //.WhereIf(g.Key.IsAutoCreate == false, t => !t.Subject.SubjectCriteriaEvaluationVisitFilterList.Where(d => d.TrialReadingCriterionId == t.TrialReadingCriterionId).Any(f => f.IsGeneratedTask == false && t.VisitTaskNum > f.SubjectVisit.VisitNum))
-                          .Where(t => c.IsAutoCreate ? !t.Subject.SubjectCriteriaEvaluationVisitFilterList.Where(d => d.TrialReadingCriterionId == t.TrialReadingCriterionId).Any(f => f.IsGeneratedTask == false && t.VisitTaskNum > f.SubjectVisit.VisitNum) : true)
+                          .Where(t => c.IsAutoCreate==false ? !t.Subject.SubjectCriteriaEvaluationVisitFilterList.Where(d => d.TrialReadingCriterionId == t.TrialReadingCriterionId).Any(f => f.IsGeneratedTask == false && t.VisitTaskNum > f.SubjectVisit.VisitNum) : true)
 
                           .Where(y => y.IsFrontTaskNeedSignButNotSign == false && (y.IsNeedClinicalDataSign == false || y.IsClinicalDataSign == true))
                           .Count(),