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

Merge branch 'master' of http://192.168.1.2:8033/IRaCIS_Core_Api

Uat_Study
he 2023-05-26 11:26:19 +08:00
parent 5f1a25c2ec 5b8f08f3a3
commit e7ddec4329
2 changed files with 66 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
View File

@ -1735,23 +1735,20 @@ namespace IRaCIS.Core.Application.Service.Allocation
//IR申请 PM 审批 注意这里有一致性分析的申请同意 不会回退访视，在此要生成影响的访视任务
else if (visitTaskReReadingAppply.RequestReReadingType == RequestReReadingType.DocotorApply && (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ProjectManager || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.AIR))
{
#region 两个IR 申请同一访视,其他人的申请记录也设置为同意
// #region 两个IR 申请同一访视,其他人的申请记录也设置为同意
await _visitTaskReReadingRepository.BatchUpdateNoTrackingAsync(t => t.OriginalReReadingTask.SubjectId == origenalTask.SubjectId &&
t.OriginalReReadingTask.ReReadingApplyState == ReReadingApplyState.DocotorHaveApplyed &&
t.RequestReReadingType == RequestReReadingType.DocotorApply &&
t.OriginalReReadingTask.VisitTaskNum == origenalTask.VisitTaskNum &&
t.Id != item.Id, u => new VisitTaskReReading()
{
RequestReReadingConfirmUserId = _userInfo.Id,
RequestReReadingResultEnum = RequestReReadingResult.Agree,
});
// await _visitTaskReReadingRepository.BatchUpdateNoTrackingAsync(t => t.OriginalReReadingTask.SubjectId == origenalTask.SubjectId &&
// t.OriginalReReadingTask.ReReadingApplyState == ReReadingApplyState.DocotorHaveApplyed &&
// t.RequestReReadingType == RequestReReadingType.DocotorApply &&
//t.OriginalReReadingTask.VisitTaskNum == origenalTask.VisitTaskNum &&
//t.Id != item.Id, u => new VisitTaskReReading()
//{
// RequestReReadingConfirmUserId = _userInfo.Id,
// RequestReReadingResultEnum = RequestReReadingResult.Agree,
//});
#endregion
// #endregion
//有序阅片

54
IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
View File

@ -951,6 +951,49 @@ namespace IRaCIS.Core.Infra.EFCore.Common
#region 热键 模板 个性化配置
if (entitys.Any(x => x.Entity.GetType() == typeof(ShortcutKey)))
{
var type = AuditOpt.Add;
var list = entitys.Where(x => x.Entity.GetType() == typeof(ShortcutKey)).Select(t => t.Entity as ShortcutKey);
var firstEntity = list.FirstOrDefault();
var cloneEntity = firstEntity.Clone();
//保证Id 唯一
cloneEntity.Id = IdentifierHelper.CreateGuid(firstEntity.UserId.ToString(), firstEntity.CreateUserId.ToString());
await InsertInspection(cloneEntity, type, x => new InspectionConvertDTO()
{
//byzhouhang
ObjectRelationParentId = x.UserId,
IsDistinctionInterface = false,
}, new
{
ShortcutKeyList = list,
});
}
foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(UserWLTemplate)))
{
var type = GetEntityAuditOpt(item);
var entity = item.Entity as UserWLTemplate;
var extraIdentification = string.Empty;
await InsertInspection<UserWLTemplate>(entity, type, x => new InspectionConvertDTO()
{
IsDistinctionInterface = false,
ObjectRelationParentId = entity.UserId
});
}
#endregion
@ -2166,9 +2209,18 @@ namespace IRaCIS.Core.Infra.EFCore.Common
var entity = item.Entity as User;
var extraIdentification = string.Empty;
//保存其他个性化配置
if (_userInfo.RequestUrl == "UserWLTemplate/setAutoCutNextTask")
{
extraIdentification = "/Personalization";
}
await InsertInspection<User>(entity, type, x => new InspectionConvertDTO()
{
IsDistinctionInterface = false
IsDistinctionInterface = false,
ExtraIndentification= extraIdentification
}, new
{
UserRealName = entity.FullName,