From fc22ec0672f2c8c62500eb4c4dca39efadb21381 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Thu, 16 May 2024 14:16:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BF=9D=E5=AD=98bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Allocation/VisitTaskHelpeService.cs       |  3 +-
 .../TrialSiteUser/TrialConfigService.cs       |  1 +
 IRaCIS.Core.Application/TestService.cs        | 35 +++++++++++++++++--
 3 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs
index 1a820291e..881da810a 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs
@@ -392,13 +392,14 @@ namespace IRaCIS.Core.Application.Service
 
 
                     }
-                    await _visitTaskRepository.SaveChangesAsync();
+
 
                 }
 
             }
 
 
+            await _visitTaskRepository.SaveChangesAsync();
         }
 
 
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
index 6e9765ed2..64ffae28b 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
@@ -601,6 +601,7 @@ namespace IRaCIS.Core.Application
 
             await _readingQuestionCriterionTrialRepository.UpdatePartialFromQueryAsync(inDto.TrialReadingCriterionId, x => new ReadingQuestionCriterionTrial()
             {
+                CriterionModalitys=inDto.CriterionModalitys,
                 ReadingTool = inDto.ReadingTool,
                 IsReadingPeriod = inDto.IsReadingPeriod,
                 //DigitPlaces=inDto.DigitPlaces,
diff --git a/IRaCIS.Core.Application/TestService.cs b/IRaCIS.Core.Application/TestService.cs
index eb856f767..23f24e1e9 100644
--- a/IRaCIS.Core.Application/TestService.cs
+++ b/IRaCIS.Core.Application/TestService.cs
@@ -2,6 +2,7 @@
 using BeetleX;
 using BeetleX.BNR;
 using Castle.DynamicProxy.Generators.Emitters.SimpleAST;
+using IRaCIS.Core.Application.Contracts;
 using IRaCIS.Core.Application.Helper;
 using IRaCIS.Core.Application.Service;
 using IRaCIS.Core.Application.ViewModel;
@@ -73,15 +74,43 @@ namespace IRaCIS.Application.Services
 
         public async Task<IResponseOutput> TestEFcore8()
         {
+            var systemDocQuery = from sysDoc in _repository.GetQueryable<SystemDocument>()
 
+                                 join confirm in _repository.GetQueryable<SystemDocConfirmedUser>().Where(t => t.ConfirmTime != null) on sysDoc.Id equals confirm.SystemDocumentId
+                                 select new UnionDocumentWithConfirmInfoView()
+                                 {
+                                     IsSystemDoc = true,
+
+                                     Id = sysDoc.Id,
+                                     CreateTime = sysDoc.CreateTime,
+                                     IsDeleted = sysDoc.IsDeleted,
+                                     SignViewMinimumMinutes = sysDoc.SignViewMinimumMinutes,
+                                     Name = sysDoc.Name,
+                                     Path = sysDoc.Path,
+                                     FileType = _userInfo.IsEn_Us ? sysDoc.FileType.Value : sysDoc.FileType.ValueCN,
+                                     FileTypeId = sysDoc.FileTypeId,
+                                     UpdateTime = sysDoc.UpdateTime,
+
+
+                                     ConfirmUserId = confirm.ConfirmUserId,
+                                     ConfirmTime = confirm.ConfirmTime,
+                                     RealName = confirm.User.FullName,
+                                     UserName = confirm.User.UserName,
+                                     UserTypeId = confirm.User.UserTypeId,
+                                     UserTypeShortName = confirm.User.UserTypeRole.UserTypeShortName,
+
+                                     FullFilePath = sysDoc.Path
+                                 };
+
+            var list=systemDocQuery.OrderBy(t=>t.ConfirmUserId).ThenBy(t=>t.ConfirmTime).ToList();
 
             //var aa= _dicRepository._dbContext.Subject.Where(t => t.Id == Guid.Empty).ExecuteUpdate("FirstName","ddd");
 
-            await _repository.BatchUpdateAsync<Subject>(t => t.Id == Guid.Empty, u => new Subject() { FirstName = "fddd", LastName = "sss", UpdateTime = DateTime.Now });
+            //await _repository.BatchUpdateAsync<Subject>(t => t.Id == Guid.Empty, u => new Subject() { FirstName = "fddd", LastName = "sss", UpdateTime = DateTime.Now });
 
-            await _repository.Where<Subject>().ExecuteUpdateAsync(t => t.SetProperty(t => t.UpdateTime, u => DateTime.Now));
+            //await _repository.Where<Subject>().ExecuteUpdateAsync(t => t.SetProperty(t => t.UpdateTime, u => DateTime.Now));
 
-            return ResponseOutput.Ok();
+            return ResponseOutput.Ok(list);
         }
         // 设置 Ne