Merge branch 'Test.IRC' of http://192.168.3.69:2000/XCKJ/irc-netcore-api into Test.IRC

IRaCIS.Core.Application/IRaCIS.Core.Application.csproj

@@ -74,10 +74,9 @@
 		<PackageReference Include="ExcelDataReader.DataSet" Version="3.6.0" />
 		<PackageReference Include="DistributedLock.Redis" Version="1.0.2" />
 		<PackageReference Include="DistributedLock.SqlServer" Version="1.0.3" />
+		<PackageReference Include="fo-dicom" Version="5.1.1" />
 		<PackageReference Include="fo-dicom.Imaging.ImageSharp" Version="5.1.0" />
-		<PackageReference Include="fo-dicom.Codecs" Version="5.1.0">
+		<PackageReference Include="fo-dicom.Codecs" Version="5.10.8" />
-			<TreatAsUsed>true</TreatAsUsed>
-		</PackageReference>
 		<PackageReference Include="Magicodes.IE.Core" Version="2.7.4.5" />
 		<PackageReference Include="Magicodes.IE.Csv" Version="2.7.4.5">
 		  <TreatAsUsed>true</TreatAsUsed>

IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs

@@ -88,7 +88,8 @@ namespace IRaCIS.Core.Application.Services
             {
                 return result.Data.CurrentPageData.First();
             }
-            else {
+            else
+            {
                 return null;
             }
 
@@ -232,14 +233,40 @@ namespace IRaCIS.Core.Application.Services
 
                                     };
 
-
+            #region 报错  奇怪的bug
             var unionQuery = systemDocumentQueryable.Union(trialDocQueryable)
                 .WhereIf(!string.IsNullOrEmpty(querySystemDocument.Name), t => t.Name.Contains(querySystemDocument.Name))
                 .WhereIf(querySystemDocument.FileTypeId != null, t => t.FileTypeId == querySystemDocument.FileTypeId)
                 .WhereIf(querySystemDocument.IsSign == true, t => t.ConfirmTime != null)
                 .WhereIf(querySystemDocument.IsSign == false, t => t.ConfirmTime == null);
 
+
+
             var result = await unionQuery.ToPagedListAsync(querySystemDocument.PageIndex, querySystemDocument.PageSize, querySystemDocument.SortField, querySystemDocument.Asc);
+            #endregion
+
+            #region 临时方案
+
+            //var list1 = systemDocumentQueryable
+            //   .WhereIf(!string.IsNullOrEmpty(querySystemDocument.Name), t => t.Name.Contains(querySystemDocument.Name))
+            //  .WhereIf(querySystemDocument.FileTypeId != null, t => t.FileTypeId == querySystemDocument.FileTypeId)
+            //  .WhereIf(querySystemDocument.IsSign == true, t => t.ConfirmTime != null)
+            //  .WhereIf(querySystemDocument.IsSign == false, t => t.ConfirmTime == null).ToList();
+
+            //var list2 = trialDocQueryable
+            // .WhereIf(!string.IsNullOrEmpty(querySystemDocument.Name), t => t.Name.Contains(querySystemDocument.Name))
+            //.WhereIf(querySystemDocument.FileTypeId != null, t => t.FileTypeId == querySystemDocument.FileTypeId)
+            //.WhereIf(querySystemDocument.IsSign == true, t => t.ConfirmTime != null)
+            //.WhereIf(querySystemDocument.IsSign == false, t => t.ConfirmTime == null).ToList();
+
+            //var list3 = list1.Union(list2).ToList();
+
+            //var result=list3.ToPagedList(querySystemDocument.PageIndex, querySystemDocument.PageSize, querySystemDocument.SortField, querySystemDocument.Asc);
+
+            #endregion
+
+
+
 
             var needSignTrialDocCount = await _trialDocumentRepository.AsQueryable(true).Where(t => t.TrialId == querySystemDocument.TrialId && t.Trial.TrialStatusStr != StaticData.TrialState.TrialStopped)
                        .Where(t => t.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id))
@@ -254,9 +281,6 @@ namespace IRaCIS.Core.Application.Services
             var trialTaskConfig = _trialRepository.Where(t => t.Id == querySystemDocument.TrialId).ProjectTo<TrialProcessConfigDTO>(_mapper.ConfigurationProvider).FirstOrDefault();
 
 
-            //var trialCriterionAdditionalAssessmentTypeList = _trialCriterionAdditionalAssessmentTypeRepository
-            //    .Where(t => t.TrialReadingCriterion.TrialId == trialId && t.IsSelected == true && t.TrialReadingCriterion.IsSigned).Select(t=>new { t.CriterionType,t.AdditionalAssessmentType}).ToList();
-
 
             var isManualGenerateTask = _readingQuestionCriterionTrialRepository.Where(t => t.TrialId == trialId && t.IsSigned && t.IsAutoCreate == false).Any();
             var isAdditionalAssessment = _readingQuestionCriterionTrialRepository.Where(t => t.TrialId == trialId && t.IsSigned && t.IsAdditionalAssessment == true

IRaCIS.Core.Domain.Share/IRaCIS.Core.Domain.Share.csproj

@@ -8,8 +8,4 @@
     <OutputPath>..\bin</OutputPath>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
-  </ItemGroup>
-
 </Project>

IRaCIS.Core.Domain/IRaCIS.Core.Domain.csproj

@@ -14,10 +14,10 @@
 
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
-		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
 		<PackageReference Include="EntityFrameworkCore.Projectables.Abstractions" Version="2.3.0" />
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.4" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
 	</ItemGroup>
 
   <ItemGroup>

IRaCIS.Core.Domain/Management/User.cs

@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+using EntityFrameworkCore.Projectables;
 using IRaCIS.Core.Domain.Share;
 
 namespace IRaCIS.Core.Domain.Models
@@ -92,7 +93,7 @@ namespace IRaCIS.Core.Domain.Models
         /// </summary>
         public bool AutoCutNextTask { get; set; } = false;
 
-		[NotMapped] 
+        [Projectable]
         public string FullName => LastName + " / " + FirstName;
 
         //[Projectable] public string FullName => $"{LastName} / {FirstName}";

IRaCIS.Core.Infra.EFCore/IRaCIS.Core.Infra.EFCore.csproj

@@ -8,7 +8,9 @@
 		<OutputPath>..\bin</OutputPath>
 	</PropertyGroup>
 
-
+	<ItemGroup>
+		<FrameworkReference Include="Microsoft.AspNetCore.App" />
+	</ItemGroup>
 
 
 	<ItemGroup>
@@ -17,13 +19,10 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="EFCore.BulkExtensions" Version="6.5.6" />
+		<PackageReference Include="EFCore.BulkExtensions" Version="7.1.6" />
-		<PackageReference Include="EntityFrameworkCore.Triggered" Version="3.2.1" />
+		<PackageReference Include="EntityFrameworkCore.Triggered" Version="3.2.2" />
 		<PackageReference Include="EntityFrameworkCore.Projectables" Version="2.3.0" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.10" />
 		<PackageReference Include="EntityFrameworkCore.Exceptions.SqlServer" Version="6.0.3.2" />
-		<PackageReference Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="2.2.0" />
-		<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
 		<PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="7.0.12" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
 		<PackageReference Include="NewId" Version="4.0.1" />

IRaCIS.Core.Infra.EFCore/Repository/IRaCISContextExtension.cs

@@ -257,11 +257,6 @@ namespace IRaCIS.Core.Infra.EFCore
 
             #endregion
 
-
-
-
-
-
         }
 
 

IRaCIS.Core.Infrastructure/IRaCIS.Core.Infrastructure.csproj

@@ -11,8 +11,8 @@
 	<ItemGroup>
 		<PackageReference Include="AutoMapper" Version="12.0.1" />
 		<PackageReference Include="AutoMapper.Collection.EntityFrameworkCore" Version="9.0.0" />
-		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.10" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.12" />
 		<PackageReference Include="SharpCompress" Version="0.34.1" />
 		<PackageReference Include="SharpZipLib" Version="1.4.2" />
 		<PackageReference Include="System.Linq.Dynamic.Core" Version="1.3.5" />

IRaCIS.Core.Infrastructure/_IRaCIS/IQueryablePageListExtensions.cs

@@ -3,6 +3,8 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
 using System.Linq.Dynamic.Core;
+using System.Collections.Generic;
+using System;
 
 namespace IRaCIS.Core.Infrastructure.Extention
 {
@@ -102,6 +104,45 @@ namespace IRaCIS.Core.Infrastructure.Extention
             return pagedList;
         }
 
+
+        public static PageOutput<T> ToPagedList<T>(this IList<T> source, int pageIndex, int pageSize, string defaultSortFiled = "Id", bool isAsc = true)
+        {
+            if (pageIndex <= 0)
+            {
+                pageIndex = 1;
+            }
+            if (pageSize <= 0)
+            {
+                pageSize = 10;
+            }
+            var count = source.Count();
+
+            if (count == 0)
+            {
+                return new PageOutput<T>() { CurrentPageData = new List<T>() };
+            }
+
+            var propName = string.IsNullOrWhiteSpace(defaultSortFiled) ? "Id" : defaultSortFiled;
+
+            IQueryable<T> sourceQuery = isAsc ? source.AsQueryable().OrderBy(propName) : source.AsQueryable().OrderBy(propName + " desc");
+
+            sourceQuery = sourceQuery.Skip((pageIndex - 1) * pageSize);
+
+            var items = sourceQuery
+                                    .Take(pageSize)
+                                    .ToArray();
+
+            var pagedList = new PageOutput<T>()
+            {
+                PageIndex = pageIndex,
+                PageSize = pageSize,
+                TotalCount = count,
+                CurrentPageData = items
+            };
+
+            return pagedList;
+        }
+
         //多字段排序 ["a asc", "b desc", "c asc"]
         public static PageOutput<T> ToPagedList<T>(this IQueryable<T> source, int pageIndex, int pageSize, string[] sortArray)
         {
@@ -180,5 +221,8 @@ namespace IRaCIS.Core.Infrastructure.Extention
 
             return pagedList;
         }
+
+
+
     }
 }

IRaCIS.Core.Test/IRaCIS.Core.Test.csproj

@@ -13,10 +13,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.8" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.12" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="coverlet.collector" Version="3.1.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>