Compare commits

..

No commits in common. "c6d74309f41678324f462aeaeeccbc573652837e" and "d600862fb026905bbef8dff0c2a332c83d252ad0" have entirely different histories.

3 changed files with 3 additions and 4 deletions

View File

@ -666,7 +666,7 @@ namespace IRaCIS.Application.Services
public async Task<IResponseOutput> AddOrUpdateReadingTableQuestionTrial(ReadingTableQuestionTrialAddOrEdit indto) public async Task<IResponseOutput> AddOrUpdateReadingTableQuestionTrial(ReadingTableQuestionTrialAddOrEdit indto)
{ {
var list = await _readingTableQuestionTrialRepository.Where(x => x.Id != indto.Id && x.ShowOrder == indto.ShowOrder && x.ReadingQuestionId == indto.ReadingQuestionId).ToListAsync();
if (await _readingTableQuestionTrialRepository.AnyAsync(x => x.Id != indto.Id && x.ShowOrder == indto.ShowOrder && x.ReadingQuestionId==indto.ReadingQuestionId)) if (await _readingTableQuestionTrialRepository.AnyAsync(x => x.Id != indto.Id && x.ShowOrder == indto.ShowOrder && x.ReadingQuestionId==indto.ReadingQuestionId))
{ {
//---问题编号重复 //---问题编号重复

View File

@ -2913,7 +2913,7 @@ namespace IRaCIS.Application.Services
task.SubjectCode = await _subjectRepository.Where(x => x.Id == task.SubjectId).Select(x => x.Code).FirstNotNullAsync(); task.SubjectCode = await _subjectRepository.Where(x => x.Id == task.SubjectId).Select(x => x.Code).FirstNotNullAsync();
} }
await _visitTaskRepository.BatchUpdateNoTrackingAsync(x => x.Id == task.VisitTaskId&&x.TaskState==TaskState.Effect&&x.ReadingTaskState!=ReadingTaskState.HaveSigned , x => new VisitTask() await _visitTaskRepository.BatchUpdateNoTrackingAsync(x => x.Id == task.VisitTaskId&&x.TaskState==TaskState.Effect&&x.ReadingTaskState!=ReadingTaskState.HaveSigned && x.FirstReadingTime == null, x => new VisitTask()
{ {
FirstReadingTime = DateTime.Now, FirstReadingTime = DateTime.Now,
}); });

View File

@ -201,8 +201,7 @@ namespace IRaCIS.Core.Application.Service
CreateMap<ReadingTableQuestionTrial, ReadingTableQuestionTrialView>() CreateMap<ReadingTableQuestionTrial, ReadingTableQuestionTrialView>()
.ForMember(d => d.DependShowOrder, u => u.MapFrom(s => s.DependParentQuestion.ShowOrder)) .ForMember(d => d.DependShowOrder, u => u.MapFrom(s => s.DependParentQuestion.ShowOrder));
.ForMember(d => d.CreateUser, u => u.Ignore());
CreateMap<ReadingTableQuestionSystemAddOrEdit, ReadingTableQuestionSystem>(); CreateMap<ReadingTableQuestionSystemAddOrEdit, ReadingTableQuestionSystem>();
CreateMap<ReadingTableQuestionTrialAddOrEdit, ReadingTableQuestionTrial>(); CreateMap<ReadingTableQuestionTrialAddOrEdit, ReadingTableQuestionTrial>();