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

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -18817,6 +18817,14 @@
             <param name="inDto"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.TrialConfigService.UpdateTrialExtralConfig(System.Guid,IRaCIS.Application.Contracts.TrialExtraConfig)">
+            <summary>
+            更新项目额外json 配置
+            </summary>
+            <param name="trialId"></param>
+            <param name="trialExtralConfig"></param>
+            <returns></returns>
+        </member>
         <member name="T:IRaCIS.Core.Application.Triggers.ChallengeStateTrigger">
             <summary>
             访视 质疑状态  触发修改

IRaCIS.Core.Application/Service/Document/DTO/TrialDocumentViewModel.cs

@@ -43,6 +43,10 @@ namespace IRaCIS.Core.Application.Contracts
         [NotDefault]
         public Guid TrialId { get; set; }
 
+        public bool? IsPublish { get; set; }
+
+        public string? FileTypeCode { get; set; }
+
     }
 
     ///<summary> TrialDocumentAddOrEdit  列表查询参数模型</summary>

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

@@ -154,6 +154,8 @@ namespace IRaCIS.Core.Application.Services
             .WhereIf(inQuery.FileTypeId != null, t => t.FileTypeId == inQuery.FileTypeId)
             .WhereIf(inQuery.UserTypeId != null, t => t.NeedConfirmedUserTypeList.Any(t => t.NeedConfirmUserTypeId == inQuery.UserTypeId))
             .WhereIf(inQuery.IsDeleted != null, t => t.IsDeleted == inQuery.IsDeleted)
+            .WhereIf(inQuery.IsPublish != null, t => t.IsPublish == inQuery.IsPublish)
+              .WhereIf(!string.IsNullOrEmpty(inQuery.FileTypeCode), t => t.FileType.Code== inQuery.FileTypeCode)
             .ProjectTo<TrialDocumentView>(_mapper.ConfigurationProvider, new { token = _userInfo.UserToken, isEn_Us = _userInfo.IsEn_Us });
 
             return await trialDocumentQueryable.ToPagedListAsync(inQuery);

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

@@ -1487,7 +1487,7 @@ namespace IRaCIS.Core.Application
 
             var extralConfig = JsonConvert.DeserializeObject<TrialExtraConfig>(extralObj?.TrialExtraConfigJsonStr) ?? new TrialExtraConfig();
 
-            var trialConfig = _mapper.Map<TrialConfigInfo> (extralConfig);
+            var trialConfig = _mapper.Map<TrialConfigInfo>(extralConfig);
 
             trialConfig.TrialObjectNameList = extralObj.TrialObjectNameList;
 
@@ -1536,5 +1536,23 @@ namespace IRaCIS.Core.Application
             await _trialRepository.SaveChangesAsync();
             return ResponseOutput.Ok();
         }
+
+        /// <summary>
+        /// 更新项目额外json 配置
+        /// </summary>
+        /// <param name="trialId"></param>
+        /// <param name="trialExtralConfig"></param>
+        /// <returns></returns>
+        [HttpPut]
+        public async Task<IResponseOutput> UpdateTrialExtralConfig(Guid trialId, TrialExtraConfig trialExtralConfig)
+        {
+            var trial = await _trialRepository.FirstOrDefaultAsync(t => t.Id == trialId);
+
+            trial.TrialExtraConfigJsonStr = trialExtralConfig.ToJsonStr();
+
+            await _trialRepository.SaveChangesAsync();
+
+            return ResponseOutput.Ok();
+        }
     }
 }