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

修复部分警告

Uat_Study
hang 2022-05-05 14:52:58 +08:00
parent 06a760eeff
commit a678e0f8e1
12 changed files with 40 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
IRaCIS.Core.API/IRaCIS.Core.API.xml
View File

@ -194,6 +194,7 @@
<summary> <summary>
一致性核查 excel上传 支持三种格式 一致性核查 excel上传 支持三种格式
</summary> </summary>
<param name="file"></param>
<param name="opt"></param> <param name="opt"></param>
<returns></returns> <returns></returns>
</member> </member>

2
IRaCIS.Core.Application/Service/Management/SystemNoticeService.cs
View File

@ -62,7 +62,7 @@ namespace IRaCIS.Core.Application.Service
} }
else else
{ {
var systemNotice = await _systemNoticeRepository.Where(t => t.Id == addOrEditSystemNotice.Id, true, true).Include(t => t.NoticeUserTypeList).FirstOrDefaultAsync(); var systemNotice = (await _systemNoticeRepository.Where(t => t.Id == addOrEditSystemNotice.Id, true, true).Include(t => t.NoticeUserTypeList).FirstOrDefaultAsync()).IfNullThrowException();
if (addOrEditSystemNotice.NoticeStateEnum == Domain.Share.Management.SystemNotice_NoticeStateEnum.HavePublished && systemNotice.NoticeStateEnum == Domain.Share.Management.SystemNotice_NoticeStateEnum.NotPublish) if (addOrEditSystemNotice.NoticeStateEnum == Domain.Share.Management.SystemNotice_NoticeStateEnum.HavePublished && systemNotice.NoticeStateEnum == Domain.Share.Management.SystemNotice_NoticeStateEnum.NotPublish)

6
IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs
View File

@ -67,10 +67,10 @@ namespace IRaCIS.Core.Application.Contracts
{ {
if (sujectVisitId != null) if (sujectVisitId != null)
{ {
subjectVisit = _subjectVisitRepository.FirstOrDefaultAsync(t => t.Id == sujectVisitId).Result.IfNullThrowException(); subjectVisit = _subjectVisitRepository.FirstOrDefaultAsync(t => t.Id == sujectVisitId).Result.IfNullThrowException();
} }
if (subjectVisit.CurrentActionUserId != _userInfo.Id) if (subjectVisit!.CurrentActionUserId != _userInfo.Id)
{ {
throw new BusinessValidationFailedException("您不是该质控任务当前领取人，没有操作权限!"); throw new BusinessValidationFailedException("您不是该质控任务当前领取人，没有操作权限!");
} }
@ -81,7 +81,7 @@ namespace IRaCIS.Core.Application.Contracts
public async Task<IResponseOutput<NoneDicomStudyAddReturnDto>> AddOrUpdateNoneDicomStudy(NoneDicomStudyAddOrEdit addOrEditNoneDicomStudy) public async Task<IResponseOutput<NoneDicomStudyAddReturnDto>> AddOrUpdateNoneDicomStudy(NoneDicomStudyAddOrEdit addOrEditNoneDicomStudy)
{ {
NoneDicomStudy optEntity = null; NoneDicomStudy? optEntity = null;
using (await _mutex.LockAsync()) using (await _mutex.LockAsync())
{ {
if (addOrEditNoneDicomStudy.Id == Guid.Empty || addOrEditNoneDicomStudy.Id == null) if (addOrEditNoneDicomStudy.Id == Guid.Empty || addOrEditNoneDicomStudy.Id == null)

8
IRaCIS.Core.Application/Service/QC/QCListService.cs
View File

@ -29,8 +29,8 @@ namespace IRaCIS.Core.Application.Image.QA
if (isNeedVisitSearch) if (isNeedVisitSearch)
{ {
var inPlanArray = VisitPlanArray.Where(t => !t.Contains('.')).Select(t => decimal.Parse(t)).ToArray(); var inPlanArray = VisitPlanArray!.Where(t => !t.Contains('.')).Select(t => decimal.Parse(t)).ToArray();
var isSelectOutPlan = VisitPlanArray.Any(t => t.Contains('.')); var isSelectOutPlan = VisitPlanArray!.Any(t => t.Contains('.'));
if (inPlanArray.Length > 0) if (inPlanArray.Length > 0)
@ -60,8 +60,8 @@ namespace IRaCIS.Core.Application.Image.QA
if (isNeedVisitSearch) if (isNeedVisitSearch)
{ {
var inPlanArray = VisitPlanArray.Where(t => !t.Contains('.')).Select(t => decimal.Parse(t)).ToArray(); var inPlanArray = VisitPlanArray!.Where(t => !t.Contains('.')).Select(t => decimal.Parse(t)).ToArray();
var isSelectOutPlan = VisitPlanArray.Any(t => t.Contains('.')); var isSelectOutPlan = VisitPlanArray!.Any(t => t.Contains('.'));
if (inPlanArray.Length > 0) if (inPlanArray.Length > 0)

2
IRaCIS.Core.Application/Service/QC/TrialQCQuestionService.cs
View File

@ -63,7 +63,7 @@ namespace IRaCIS.Core.Application.Contracts
{ {
var selectItem = initList.FirstOrDefault(t => t.Id == trialQCQuestionFilterSelect.Id); var selectItem = initList.FirstOrDefault(t => t.Id == trialQCQuestionFilterSelect.Id);
initList = initList.WhereIf(selectItem!=null, t => t.Id != selectItem.Id && t.ShowOrder < selectItem.ShowOrder).ToList(); initList = initList.WhereIf(selectItem != null, t => t.Id != selectItem!.Id && t.ShowOrder < selectItem.ShowOrder).ToList();
} }

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

@ -228,7 +228,7 @@ namespace IRaCIS.Core.Application.Service
var builder = new BodyBuilder(); var builder = new BodyBuilder();
var sysUserInfo = await _userRepository.Where(t => t.Id == userInfo.SystemUserId).FirstOrDefaultAsync(); var sysUserInfo = (await _userRepository.Where(t => t.Id == userInfo.SystemUserId).FirstOrDefaultAsync()).IfNullThrowException();
builder.HtmlBody = @$"<body style='font-family: 微软雅黑;padding: 0;margin: 0;'> builder.HtmlBody = @$"<body style='font-family: 微软雅黑;padding: 0;margin: 0;'>
@ -338,7 +338,7 @@ namespace IRaCIS.Core.Application.Service
var builder = new BodyBuilder(); var builder = new BodyBuilder();
var sysUserInfo = await _userRepository.Where(t => t.Id == needUpdate.SystemUserId).Include(t => t.UserTypeRole).FirstOrDefaultAsync(); var sysUserInfo = (await _userRepository.Where(t => t.Id == needUpdate.SystemUserId).Include(t => t.UserTypeRole).FirstOrDefaultAsync()).IfNullThrowException();
int verificationCode = new Random().Next(100000, 1000000); int verificationCode = new Random().Next(100000, 1000000);

2
IRaCIS.Core.Application/Service/Visit/SubjectService.cs
View File

@ -48,7 +48,7 @@ namespace IRaCIS.Application.Services
bool isadd = false; bool isadd = false;
Subject mapedSubject = null; Subject? mapedSubject = null;
if (subjectCommand.Id == null) //insert if (subjectCommand.Id == null) //insert
{ {

2
IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
View File

@ -52,7 +52,7 @@ namespace IRaCIS.Core.Application.Services
svCommand.VisitExecuted = svCommand.IsLostVisit ? VisitExecutedEnum.Executed : svCommand.VisitExecuted; svCommand.VisitExecuted = svCommand.IsLostVisit ? VisitExecutedEnum.Executed : svCommand.VisitExecuted;
SubjectVisit dbBeforeEntity = null; SubjectVisit? dbBeforeEntity = null;
//Add //Add
if (svCommand.Id == null) if (svCommand.Id == null)
{ {

4
IRaCIS.Core.Application/Triggers/SubjectStateTrigger.cs
View File

@ -31,7 +31,7 @@ namespace IRaCIS.Core.Application.Triggers
{ {
//Site变更 //Site变更
if ( context.Entity.SiteId != context.UnmodifiedEntity.SiteId) if ( context.Entity.SiteId != context.UnmodifiedEntity?.SiteId)
{ {
var subjectId = context.Entity.Id; var subjectId = context.Entity.Id;
var siteId = context.Entity.SiteId; var siteId = context.Entity.SiteId;
@ -59,7 +59,7 @@ namespace IRaCIS.Core.Application.Triggers
// 出组 状态发生了变更 // 出组 状态发生了变更
if (context.Entity.Status == SubjectStatus.OutOfVisit && context.Entity.Status != context.UnmodifiedEntity.Status) if (context.Entity.Status == SubjectStatus.OutOfVisit && context.Entity.Status != context.UnmodifiedEntity?.Status)
{ {
if (context.Entity.FinalSubjectVisitId != null) if (context.Entity.FinalSubjectVisitId != null)
{ {

2
IRaCIS.Core.Application/Triggers/SubjectVisitFinalVisitTrigger.cs
View File

@ -28,7 +28,7 @@ namespace IRaCIS.Core.Application.Triggers
{ {
// 修改了IsFinalVisit // 修改了IsFinalVisit
if (context.UnmodifiedEntity.IsFinalVisit != subjectVisit.IsFinalVisit) if (context.UnmodifiedEntity?.IsFinalVisit != subjectVisit.IsFinalVisit)
{ {
if (context.Entity.IsFinalVisit) if (context.Entity.IsFinalVisit)
{ {

2
IRaCIS.Core.Application/Triggers/TrialVisitPlanConfirmTrigger.cs
View File

@ -36,7 +36,7 @@ namespace IRaCIS.Core.Application.Triggers
{ {
//项目访视计划确认 状态改变触发 //项目访视计划确认 状态改变触发
if (trial.VisitPlanConfirmed && trial.VisitPlanConfirmed != context.UnmodifiedEntity.VisitPlanConfirmed) if (trial.VisitPlanConfirmed && trial.VisitPlanConfirmed != context.UnmodifiedEntity?.VisitPlanConfirmed)
{ {
//找到访视计划修改的Item //找到访视计划修改的Item
var changedList = await _visitStageRepository.Where(t => t.TrialId == trial.Id && t.IsConfirmed == false) var changedList = await _visitStageRepository.Where(t => t.TrialId == trial.Id && t.IsConfirmed == false)

37
IRaCIS.Core.Infra.EFCore/Repository/Repository.cs
View File

@ -324,7 +324,7 @@ namespace IRaCIS.Core.Infra.EFCore
{ {
var query = ignoreQueryFilter ? _dbSet.AsNoTracking().IgnoreQueryFilters() : _dbSet.AsNoTracking(); var query = ignoreQueryFilter ? _dbSet.AsNoTracking().IgnoreQueryFilters() : _dbSet.AsNoTracking();
var waitDelete = await query.Where(t=>t.Id== id).FirstOrDefaultAsync(); var waitDelete = await query.Where(t => t.Id == id).FirstOrDefaultAsync();
if (waitDelete == null) if (waitDelete == null)
{ {
@ -572,11 +572,11 @@ namespace IRaCIS.Core.Infra.EFCore
{ {
foreach (var item in dto.Items) foreach (var item in dto.Items)
{ {
item.Json = await GetInspectionEnumValue(item.Identification,item.Json); item.Json = await GetInspectionEnumValue(item.Identification, item.Json);
item.Json = await SetEnum(dto.TrialId, item.Identification, item.Json); item.Json = await SetEnum(dto.TrialId, item.Identification, item.Json);
} }
return dto.Items.Select(x=>x.Json).ToList(); return dto.Items.Select(x => x.Json).ToList();
} }
@ -608,7 +608,7 @@ namespace IRaCIS.Core.Infra.EFCore
continue; continue;
} }
string Table = item.ForeignKeyTable; string Table = item.ForeignKeyTable;
string ForeignKeyValue = item.ForeignKeyValue; string ForeignKeyValue = item.ForeignKeyValue;
string ForeignKeyText = item.ForeignKeyText; string ForeignKeyText = item.ForeignKeyText;
string value = JsonDataValue[item.Key].ToString(); string value = JsonDataValue[item.Key].ToString();
string para = string.Empty; string para = string.Empty;
@ -631,7 +631,7 @@ namespace IRaCIS.Core.Infra.EFCore
new SqlParameter("@para",para) new SqlParameter("@para",para)
}; };
JsonDataValue[item.Key] = string.Join(",", _dbContext.Database.SqlQuery<ForeignKey>(sql, paravalue).Select(x => x.Text).ToList()); JsonDataValue[item.Key] = string.Join(",", _dbContext.Database.SqlQuery<ForeignKey>(sql, paravalue).Select(x => x.Text).ToList());
} }
return JsonConvert.SerializeObject(JsonDataValue); return JsonConvert.SerializeObject(JsonDataValue);
} }
@ -647,7 +647,7 @@ namespace IRaCIS.Core.Infra.EFCore
public async Task<string> SetEnum(Guid trilaid, string identification, string json) public async Task<string> SetEnum(Guid trilaid, string identification, string json)
{ {
var list = await (from u in _dbContext.FrontAuditConfig.Where(x => x.Identification == identification) var list = await (from u in _dbContext.FrontAuditConfig.Where(x => x.Identification == identification)
join p in _dbContext.FrontAuditConfig.Where(x => x.Code != "AuditState" && x.EnumType=="Date") on u.Id equals p.ParentId join p in _dbContext.FrontAuditConfig.Where(x => x.Code != "AuditState" && x.EnumType == "Date") on u.Id equals p.ParentId
select new select new
{ {
Key = p.Code, Key = p.Code,
@ -775,11 +775,12 @@ namespace IRaCIS.Core.Infra.EFCore
private async Task AddInspectionAsync(TEntity entity, bool isSaveAudit = false) private async Task AddInspectionAsync(TEntity entity, bool isSaveAudit = false)
{ {
bool needsave = true; bool needsave = true;
DataInspection inspectionData = new DataInspection() { DataInspection inspectionData = new DataInspection()
{
Identification = $"{GetRequestUrl()}/{ typeof(TEntity).ToString().Substring(typeof(TEntity).ToString().LastIndexOf('.') + 1)}/Add", Identification = $"{GetRequestUrl()}/{ typeof(TEntity).ToString().Substring(typeof(TEntity).ToString().LastIndexOf('.') + 1)}/Add",
}; };
MapData(entity, inspectionData); MapData(entity, inspectionData);
var createtime = DateTime.Now; var createtime = DateTime.Now;
@ -894,7 +895,7 @@ namespace IRaCIS.Core.Infra.EFCore
{ {
await AddInspectionRecordAsync(inspectionData, entity); await AddInspectionRecordAsync(inspectionData, entity);
} }
} }
@ -1088,7 +1089,7 @@ namespace IRaCIS.Core.Infra.EFCore
} }
} }
/// <summary> /// <summary>
@ -1271,7 +1272,7 @@ namespace IRaCIS.Core.Infra.EFCore
} }
#endregion #endregion
} }
#endregion #endregion
@ -1331,9 +1332,15 @@ namespace IRaCIS.Core.Infra.EFCore
{ {
query = query.IgnoreQueryFilters(); query = query.IgnoreQueryFilters();
} }
if (exp == null)
return await query.FirstOrDefaultAsync().ConfigureAwait(false);
return await query.FirstOrDefaultAsync(exp).ConfigureAwait(false); if (exp != null)
{
query = query.Where(exp);
}
return await query.FirstOrDefaultAsync().ConfigureAwait(false);
} }
#endregion #endregion