TA筛选人员，PM 根据标准筛选人员

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

@@ -1148,6 +1148,11 @@
         <member name="M:IRaCIS.Core.Application.Service.SystemNoticeService.GetUserSystemNoticeList(IRaCIS.Core.Application.ViewModel.SystemNoticeQuery)">
             <summary>获取登陆用户的系统通知列表  只是过滤了用户类型 和已经发布的</summary>
         </member>
+        <member name="T:IRaCIS.Core.Application.Service.UserLogService">
+            <summary>
+            UserLogService
+            </summary>	
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.QCCommon.VerifyIsCRCSubmmitAsync(IRaCIS.Core.Infra.EFCore.IRepository,IRaCIS.Core.Domain.Share.IUserInfo,System.Nullable{System.Guid})">
             <summary>
             验证CRC 是否已提交 已提交 就不允许进行任何操作，如果是IQC 那么还验证是否是当前任务领取人
@@ -8183,6 +8188,15 @@
         <member name="T:IRaCIS.Core.Application.ViewModel.SystemNoticeAddOrEdit">
             <summary> SystemNoticeAddOrEdit  列表查询参数模型</summary>
         </member>
+        <member name="T:IRaCIS.Core.Application.ViewModel.UserLogView">
+            <summary> UserLogView  列表视图模型 </summary>
+        </member>
+        <member name="T:IRaCIS.Core.Application.ViewModel.UserLogQuery">
+            <summary>UserLogQuery  列表查询参数模型</summary>
+        </member>
+        <member name="T:IRaCIS.Core.Application.ViewModel.UserLogAddOrEdit">
+            <summary> UserLogAddOrEdit  列表查询参数模型</summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.ViewModel.TirggerTaskInfo.TargetAssessmentIsIUorIC">
             <summary>
             靶病灶是否为IUPD或者ICPD
@@ -9011,6 +9025,11 @@
             ISystemNoticeService
             </summary>	
         </member>
+        <member name="T:IRaCIS.Core.Application.Interfaces.IUserLogService">
+            <summary>
+            IUserLogService
+            </summary>	
+        </member>
         <member name="T:IRaCIS.Core.Application.Interfaces.ISubjectCriteriaEvaluationService">
             <summary>
             ISubjectCriteriaEvaluationService

IRaCIS.Core.Application/Service/TrialSiteUser/Interface/ITrialMaintenanceService.cs

@@ -9,6 +9,6 @@ namespace IRaCIS.Application.Interfaces
         Task<IResponseOutput> DeleteMaintenanceUser(Guid id, bool isDelete);
         Task<PageOutput<TrialMaintenanceDTO>> GetMaintenanceUserList(TrialMaintenanceQuery param);
         Task<PageOutput<AssginSiteCRCListDTO>> GetSiteCRCScreeningList(SiteCRCQuery param);
-        Task<PageOutput<TrialUserScreeningDTO>> GetTrialUserScreeningList(TrialUserQuery trialUserQuery);
+        Task<IResponseOutput<PageOutput<TrialUserScreeningDTO>>> GetTrialUserScreeningList(TrialUserQuery trialUserQuery);
     }
 }

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

@@ -111,15 +111,12 @@ namespace IRaCIS.Application.Services
 
         /// <summary> Setting页面   项目参与人员勾选列表   </summary>
         [HttpPost]
-        public async Task<PageOutput<TrialUserScreeningDTO>> GetTrialUserScreeningList(TrialUserQuery trialUserQuery)
+        public async Task<IResponseOutput<PageOutput<TrialUserScreeningDTO>> > GetTrialUserScreeningList(TrialUserQuery trialUserQuery)
         {
-            var trialType = _trialRepository.Where(t => t.Id == trialUserQuery.TrialId).Select(t => t.TrialType).FirstOrDefault();
+            var trialConfig = _trialRepository.Where(t => t.Id == trialUserQuery.TrialId).Select(t => new { t.TrialType ,t.QCProcessEnum}).FirstOrDefault();
 
-            var userTypeEnums = new List<UserTypeEnum>() { UserTypeEnum.IQC, UserTypeEnum.APM, UserTypeEnum.MIM, UserTypeEnum.QA };
+            var trialType = trialConfig.TrialType;
-            if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.SuperAdmin)
+            var qcProcessEnum=trialConfig.QCProcessEnum;
-            {
-                userTypeEnums.Add(UserTypeEnum.ProjectManager);
-            }
 
 
             //之前已经选择的用户 不放在列表中，现在又要改回去 废弃
@@ -131,7 +128,12 @@ namespace IRaCIS.Application.Services
                  //测试项目 可以加入 测试用户  或者内部正式用户
                  .WhereIf(trialType == TrialType.NoneOfficial, t => t.IsTestUser == true || (t.IsTestUser == false && t.IsZhiZhun))
 
+                 //TA  只能加PM
+                 .WhereIf(_userInfo.UserTypeEnumInt==(int)UserTypeEnum.TA, t => t.UserTypeEnum== UserTypeEnum.ProjectManager)
 
+                 //PM  不审  只能加IM    IQC
+                 .WhereIf(qcProcessEnum == TrialQCProcess.NotAudit, t => t.UserTypeEnum == UserTypeEnum.IM)
+                 .WhereIf(qcProcessEnum != TrialQCProcess.NotAudit, t =>( t.UserTypeEnum == UserTypeEnum.IM|| t.UserTypeEnum == UserTypeEnum.IQC))
 
 
 
@@ -143,9 +145,11 @@ namespace IRaCIS.Application.Services
                  //.WhereIf(!_userInfo.IsAdmin, t => t.UserTypeRole.Type == UserTypeGroup.TrialUser || t.UserTypeEnum != UserTypeEnum.ProjectManager)
                  .ProjectTo<TrialUserScreeningDTO>(_mapper.ConfigurationProvider, new { trialId = trialUserQuery.TrialId });
 
-            return await query.ToPagedListAsync(trialUserQuery.PageIndex,
+            var pageList= await query.ToPagedListAsync(trialUserQuery.PageIndex,
                trialUserQuery.PageSize, string.IsNullOrWhiteSpace(trialUserQuery.SortField) ? "UserRealName" : trialUserQuery.SortField, trialUserQuery.Asc);
 
+            return ResponseOutput.Ok(pageList, trialConfig);
+
         }