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

修改

Browse Source
This commit is contained in:
he
2022-04-27 13:10:39 +08:00
parent d54193031e
commit 9180fd38df
8 changed files with 59 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs
+2 -2
View File
@@ -33,9 +33,9 @@ namespace IRaCIS.Core.Application.Service
/// <param name="dto"></param>
/// <returns></returns>
[HttpPost]
public async Task<List<string>> SetDictionaryValue(SetDictionaryValueDto dto)
public async Task<List<string>> SetInspectionEnumValue(SetInspectionEnumValueDto dto)
{
return await _frontAuditConfigRepository.SetDictionaryValue(dto);
return await _frontAuditConfigRepository.SetInspectionEnumValue(dto);
}
/// <summary>
IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs
+5 -3
View File
@@ -253,6 +253,10 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO
public bool obtaionOrCancel { get; set; }
}
/// <summary>
/// 稽查泛型Dto
/// </summary>
/// <typeparam name="T">泛型</typeparam>
public class DataInspectionDto<T> : IInspectionDTO, ISignDTO
{
@@ -267,9 +271,7 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO
{
if (auditInfo.JsonDetail.IsNullOrEmpty())
{
IsoDateTimeConverter timeFormat = new IsoDateTimeConverter();
timeFormat.DateTimeFormat = "yyyy-MM-dd";
auditInfo.JsonDetail = JsonConvert.SerializeObject(OptCommand, Newtonsoft.Json.Formatting.Indented, timeFormat);
auditInfo.JsonDetail = JsonConvert.SerializeObject(OptCommand);
}
return auditInfo;
IRaCIS.Core.Application/Service/QC/QCOperationService.cs
+3
View File
@@ -922,6 +922,7 @@ namespace IRaCIS.Core.Application.Image.QA
}
// 移动不进去
await _trialRepository.AddListInspectionRecordAsync(datas);
await _repository.SaveChangesAsync();
return ResponseOutput.Ok();
@@ -2051,6 +2052,8 @@ namespace IRaCIS.Core.Application.Image.QA
data.JsonDetail = JsonConvert.SerializeObject(keyValuePairs);
datas.Add(data);
}
// 这里使用的是批量更新
await _subjectVisitRepository.AddListInspectionRecordAsync(datas);
await _subjectVisitRepository.SaveChangesAsync();
IRaCIS.Core.Application/Service/Visit/VisitPlanService.cs
+30 -30
View File
@@ -296,38 +296,38 @@ namespace IRaCIS.Application.Services
foreach (var changedItem in changedList)
{
//foreach (var changedItem in changedList)
//{
var list = await _subjectVisitRepository.Where(t => t.TrialId == trialId && t.VisitStageId == changedItem.Id).ToListAsync();
list.ForEach(x =>
{
datas.Add(new DataInspection()
{
BlindName = x.BlindName,
IsSign = false,
SiteId = x.SiteId,
SubjectId = x.SubjectId,
SubjectVisitId = x.Id,
CreateTime = createtime,
SubjectVisitName = x.VisitName,
TrialId = x.TrialId,
Reason = "确认访视修改状态",
JsonDetail = JsonConvert.SerializeObject(new
{
IsBaseLine = changedItem.IsBaseLine,
VisitName = changedItem.VisitName,
VisitNum = changedItem.VisitNum,
VisitDay = changedItem.VisitDay,
SubmitState = x.SubmitState,
VisitWindowLeft = changedItem.VisitWindowLeft,
VisitWindowRight = changedItem.VisitWindowRight
}),
Identification = "Edit|Visit|Info|Visit-Image Upload"
});
});
// var list = await _subjectVisitRepository.Where(t => t.TrialId == trialId && t.VisitStageId == changedItem.Id).ToListAsync();
// list.ForEach(x =>
// {
// datas.Add(new DataInspection()
// {
// BlindName = x.BlindName,
// IsSign = false,
// SiteId = x.SiteId,
// SubjectId = x.SubjectId,
// SubjectVisitId = x.Id,
// CreateTime = createtime,
// SubjectVisitName = x.VisitName,
// TrialId = x.TrialId,
// Reason = "确认访视修改状态",
// JsonDetail = JsonConvert.SerializeObject(new
// {
// IsBaseLine = changedItem.IsBaseLine,
// VisitName = changedItem.VisitName,
// VisitNum = changedItem.VisitNum,
// VisitDay = changedItem.VisitDay,
// SubmitState = x.SubmitState,
// VisitWindowLeft = changedItem.VisitWindowLeft,
// VisitWindowRight = changedItem.VisitWindowRight
// }),
// Identification = "Edit|Visit|Info|Visit-Image Upload"
// });
// });
}
//}
var subjectsids = _repository.GetQueryable<Subject>().Where(x => x.TrialId == trialId).Select(x => new
{
IRaCIS.Core.Application/Triggers/SubjectVisitTrigger.cs
+1
View File
@@ -86,6 +86,7 @@ namespace IRaCIS.Core.Application.Triggers
JsonDetail = subjectvisit.ToJcJson(),
});
// 这里是触发器的位置
await _subjectVisitRepository.AddListInspectionRecordAsync(datas);
await _subjectVisitRepository.BatchUpdateNoTrackingAsync(t => t.Id == subjectVisitId && t.SubmitState == SubmitStateEnum.ToSubmit,