XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改添加人员
continuous-integration/drone/push Build is passing Details

Uat_IRC_Net8
hang 2024-12-31 13:28:14 +08:00
parent bf2b439ce1
commit 518ed694fb
4 changed files with 20 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
View File

@ -12913,9 +12913,6 @@
<member name="M:IRaCIS.Core.Application.Service.TrialMaintenanceService.GetSiteCRCScreeningList(IRaCIS.Application.Contracts.SiteCRCQuery)"> <member name="M:IRaCIS.Core.Application.Service.TrialMaintenanceService.GetSiteCRCScreeningList(IRaCIS.Application.Contracts.SiteCRCQuery)">
<summary> Setting页面 为 site 勾选CRC用户列表</summary> <summary> Setting页面 为 site 勾选CRC用户列表</summary>
</member> </member>
<member name="M:IRaCIS.Core.Application.Service.TrialMaintenanceService.DeleteMaintenanceUser(System.Guid,System.Boolean)">
<summary> 项目参与人员退出 其中IQC退出 回去释放工作量 </summary>
</member>
<member name="M:IRaCIS.Core.Application.Service.TrialService.GetTrialList(IRaCIS.Application.Contracts.TrialQueryDTO)"> <member name="M:IRaCIS.Core.Application.Service.TrialService.GetTrialList(IRaCIS.Application.Contracts.TrialQueryDTO)">
<summary> <summary>
分页获取临床项目列表 默认后台加急状态为3 查所有的 分页获取临床项目列表 默认后台加急状态为3 查所有的

9
IRaCIS.Core.Application/Service/TrialSiteUser/TrialExternalUserService.cs
View File

@ -346,6 +346,14 @@ namespace IRaCIS.Core.Application.Service
{ {
//有该人员 //有该人员
if (findTrialUser.IsDeleted == true)
{
findTrialUser.IsDeleted = false;
findTrialUser.DeletedTime = null;
findTrialUser.RemoveTime = null;
findTrialUser.JoinTime = DateTime.Now;
}
//是否有该角色 //是否有该角色
foreach (var userTypeId in userTypeIdList) foreach (var userTypeId in userTypeIdList)
@ -364,7 +372,6 @@ namespace IRaCIS.Core.Application.Service
{ {
findTrialUserRole.IsDeleted = false; findTrialUserRole.IsDeleted = false;
findTrialUserRole.DeletedTime = null; findTrialUserRole.DeletedTime = null;
findTrialUserRole.RemoveTime = null;
} }
} }

41
IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs
View File

@ -204,6 +204,7 @@ namespace IRaCIS.Core.Application.Service
if (findTrialuser.IsDeleted = true) if (findTrialuser.IsDeleted = true)
{ {
findTrialuser.IsDeleted = false; findTrialuser.IsDeleted = false;
findTrialuser.DeletedTime = null;
findTrialuser.JoinTime = DateTime.Now; findTrialuser.JoinTime = DateTime.Now;
findTrialuser.RemoveTime = null; findTrialuser.RemoveTime = null;
} }
@ -245,45 +246,5 @@ namespace IRaCIS.Core.Application.Service
/// <summary> 项目参与人员退出 其中IQC退出 回去释放工作量 </summary>
//[TrialAudit(AuditType.TrialAudit, AuditOptType.DeleteTrailStaff)]
[HttpDelete, Route("{id:guid}/{trialId:guid}/{isDelete:bool}")]
[TrialGlobalLimit("AfterStopCannNotOpt")]
[UnitOfWork]
[Obsolete]
public async Task<IResponseOutput> DeleteMaintenanceUser(Guid id, bool isDelete)
{
var trialUser = await _trialUseRoleRepository.AsQueryable().IgnoreQueryFilters().FirstOrDefaultAsync(t => t.Id == id);
if (trialUser == null) return Null404NotFound(trialUser);
if (await _trialSiteUserRoleRepository.AnyAsync(t => t.UserId == trialUser.UserId && t.TrialId == trialUser.TrialId))
{
//---人员已加入现场维护
return ResponseOutput.NotOk(_localizer["TrialMaint_PersonnelJoined"]);
}
if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.IQC && isDelete)
{
await _subjectVisitRepository.BatchUpdateNoTrackingAsync(t => t.CurrentActionUserId == trialUser.UserId && t.TrialId == trialUser.TrialId && t.IsTake, u => new SubjectVisit() { CurrentActionUserId = null, CurrentActionUserExpireTime = null, IsTake = false });
}
await _trialUseRoleRepository.BatchUpdateNoTrackingAsync(t => t.Id == id, u => new TrialUserRole() { IsDeleted = isDelete, RemoveTime = isDelete ? DateTime.Now : null });
await _trialUseRoleRepository.SaveChangesAsync();
return ResponseOutput.Ok();
}
} }
} }

13
IRaCIS.Core.Application/Service/WorkLoad/EnrollService.cs
View File

@ -428,6 +428,16 @@ namespace IRaCIS.Core.Application.Service
} }
else else
{ {
if (findTrialUser.IsDeleted == true)
{
findTrialUser.IsDeleted = false;
findTrialUser.DeletedTime = null;
findTrialUser.RemoveTime = null;
findTrialUser.JoinTime = DateTime.Now;
}
var findTrialUserRole = findTrialUser.TrialUserRoleList.Where(t => t.UserRole.UserTypeId == userRoleId).FirstOrDefault(); var findTrialUserRole = findTrialUser.TrialUserRoleList.Where(t => t.UserRole.UserTypeId == userRoleId).FirstOrDefault();
if (findTrialUserRole == null) if (findTrialUserRole == null)
@ -441,8 +451,7 @@ namespace IRaCIS.Core.Application.Service
if (findTrialUserRole.IsDeleted == true) if (findTrialUserRole.IsDeleted == true)
{ {
findTrialUserRole.IsDeleted = false; findTrialUserRole.IsDeleted = false;
findTrialUserRole.DeletedTime = null; findTrialUser.DeletedTime = null;
findTrialUserRole.RemoveTime = null;
} }
} }