diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 2adad932d..60aa2edfe 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -1148,6 +1148,11 @@
获取登陆用户的系统通知列表 只是过滤了用户类型 和已经发布的
+
+
+ UserLogService
+
+
验证CRC 是否已提交 已提交 就不允许进行任何操作,如果是IQC 那么还验证是否是当前任务领取人
@@ -8183,6 +8188,15 @@
SystemNoticeAddOrEdit 列表查询参数模型
+
+ UserLogView 列表视图模型
+
+
+ UserLogQuery 列表查询参数模型
+
+
+ UserLogAddOrEdit 列表查询参数模型
+
靶病灶是否为IUPD或者ICPD
@@ -9011,6 +9025,11 @@
ISystemNoticeService
+
+
+ IUserLogService
+
+
ISubjectCriteriaEvaluationService
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/Interface/ITrialMaintenanceService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/Interface/ITrialMaintenanceService.cs
index 99668f051..cea95a7e3 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/Interface/ITrialMaintenanceService.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/Interface/ITrialMaintenanceService.cs
@@ -9,6 +9,6 @@ namespace IRaCIS.Application.Interfaces
Task DeleteMaintenanceUser(Guid id, bool isDelete);
Task> GetMaintenanceUserList(TrialMaintenanceQuery param);
Task> GetSiteCRCScreeningList(SiteCRCQuery param);
- Task> GetTrialUserScreeningList(TrialUserQuery trialUserQuery);
+ Task>> GetTrialUserScreeningList(TrialUserQuery trialUserQuery);
}
}
\ No newline at end of file
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs
index bb58a11ec..433543bd8 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs
@@ -111,15 +111,12 @@ namespace IRaCIS.Application.Services
/// Setting页面 项目参与人员勾选列表
[HttpPost]
- public async Task> GetTrialUserScreeningList(TrialUserQuery trialUserQuery)
+ public async Task> > 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.IQC, UserTypeEnum.APM, UserTypeEnum.MIM, UserTypeEnum.QA };
- if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.SuperAdmin)
- {
- userTypeEnums.Add(UserTypeEnum.ProjectManager);
- }
+ var trialType = trialConfig.TrialType;
+ var qcProcessEnum=trialConfig.QCProcessEnum;
//之前已经选择的用户 不放在列表中,现在又要改回去 废弃
@@ -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(_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);
+
}