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

修改

Uat_Study
he 2022-08-11 13:43:45 +08:00
parent 039b478261
commit e2ad22437f
2 changed files with 107 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
View File

@ -49,6 +49,31 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public ArbitrationRule ArbitrationRule { get; set; }
}
public enum NeedSynchronize
{
/// <summary>
/// 需要
/// </summary>
Need=0,
/// <summary>
/// 不需要
/// </summary>
NotNeed = 1,
/// <summary>
/// 裁判不相等
/// </summary>
JudgeNotEqual=2,
}
public class SynchronizeCriterionInDto
{
[NotDefault]
public Guid TrialId { get; set; }
}
public class VerifyeCriterionNeedSynchronizeInDto
{
[NotDefault]

61
IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs
View File

@ -104,43 +104,70 @@ namespace IRaCIS.Application.Services
/// <param name="inDto"></param>
/// <returns></returns>
[HttpPost]
public async Task<bool> VerifyeCriterionNeedSynchronize(VerifyeCriterionNeedSynchronizeInDto inDto)
public async Task<NeedSynchronize> VerifyeCriterionNeedSynchronize(VerifyeCriterionNeedSynchronizeInDto inDto)
{
var trialCriterion = await _readingQuestionCriterionTrialRepository.Where(x => x.TrialId == inDto.TrialId&&x.IsConfirm).FirstOrDefaultAsync();
if (trialCriterion == null)
{
return false;
return NeedSynchronize.NotNeed;
}
if (trialCriterion.ReadingQuestionCriterionSystemId != null)
{
var systemCriterion = await _readingQuestionCriterionSystemRepository.Where(x => x.Id == trialCriterion.ReadingQuestionCriterionSystemId).FirstNotNullAsync();
if (systemCriterion.ConfirmTime > trialCriterion.SynchronizeTime)
{
await SynchronizeCriterion(trialCriterion.Id);
return true;
var systemQuestionList = await _readingQuestionSystemRepository.Where(x => x.IsJudgeQuestion && x.ReadingQuestionCriterionSystemId == trialCriterion.ReadingQuestionCriterionSystemId).ToListAsync();
var trialQuestionList = await _readingQuestionTrialRepository.Where(x => x.IsJudgeQuestion && x.ReadingQuestionCriterionTrialId == trialCriterion.Id).ToListAsync();
if (systemQuestionList.Count() != trialQuestionList.Count())
{
return NeedSynchronize.JudgeNotEqual;
}
foreach (var item in trialQuestionList)
{
var systemQuestion= systemQuestionList.Where(x=>x.Id== (item.ReadingQuestionSystemId??default(Guid))).FirstOrDefault();
if (systemQuestion == null)
{
return NeedSynchronize.JudgeNotEqual;
}
if (systemQuestion.TypeValue != item.TypeValue)
{
return NeedSynchronize.JudgeNotEqual;
}
}
return NeedSynchronize.Need;
}
else
{
return false;
return NeedSynchronize.NotNeed;
}
}
else
{
return false;
return NeedSynchronize.NotNeed;
}
}
/// <summary>
/// 同步标准到项目新（2022-08-10）
/// </summary>
/// <param name="trialCriterionId"></param>
/// <param name="inDto"></param>
/// <returns></returns>
public async Task SynchronizeCriterion(Guid trialCriterionId)
public async Task SynchronizeCriterion(SynchronizeCriterionInDto inDto)
{
var trialCriterion = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == trialCriterionId).FirstNotNullAsync();
if(trialCriterion.ReadingQuestionCriterionSystemId!=null)
var trialCriterion = await _readingQuestionCriterionTrialRepository.Where(x => x.TrialId == inDto.TrialId&&x.IsConfirm).AsNoTracking().FirstOrDefaultAsync();
if (trialCriterion != null)
{
if (trialCriterion.ReadingQuestionCriterionSystemId != null)
{
// 将系统里面的问题转为项目问题
@ -148,11 +175,11 @@ namespace IRaCIS.Application.Services
.ProjectTo<ReadingQuestionTrial>(_mapper.ConfigurationProvider).ToListAsync();
newTrialQuestionList.ForEach(x => {
x.Id = NewId.NextGuid();
x.ReadingQuestionCriterionTrialId = trialCriterionId;
x.ReadingQuestionCriterionTrialId = trialCriterion.Id;
x.TrialId = trialCriterion.TrialId;
});
var copeNewQuestionList = newTrialQuestionList.Clone();
var trialQuestionList = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == trialCriterionId).ToListAsync();
var trialQuestionList = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == trialCriterion.Id).ToListAsync();
var needAddDatas = new List<ReadingQuestionTrial>();
@ -166,13 +193,13 @@ namespace IRaCIS.Application.Services
var systemData = _mapper.Map<ReadingQuestionSystem>(x);
var newData = _mapper.Map(systemData, firstQuestion);
newData.Id = x.Id;
newData.ReadingQuestionSystemId= x.ReadingQuestionSystemId;
newData.ReadingQuestionSystemId = x.ReadingQuestionSystemId;
question = newData.Clone();
}
if (question.ParentId != null)
{
question.ParentId = copeNewQuestionList.Where(y =>x.ParentId==y.ReadingQuestionSystemId ).Select(y => y.Id).FirstOrDefault();
question.ParentId = copeNewQuestionList.Where(y => x.ParentId == y.ReadingQuestionSystemId).Select(y => y.Id).FirstOrDefault();
}
if (question.RelevanceId != null)
{
@ -182,9 +209,9 @@ namespace IRaCIS.Application.Services
needAddDatas.Add(question);
};
await _readingQuestionTrialRepository.BatchDeleteNoTrackingAsync(x => x.ReadingQuestionCriterionTrialId == trialCriterionId);
await _readingQuestionTrialRepository.BatchDeleteNoTrackingAsync(x => x.ReadingQuestionCriterionTrialId == trialCriterion.Id);
await _readingQuestionTrialRepository.AddRangeAsync(needAddDatas);
await _readingQuestionCriterionTrialRepository.UpdatePartialFromQueryAsync(trialCriterionId, x => new ReadingQuestionCriterionTrial()
await _readingQuestionCriterionTrialRepository.UpdatePartialFromQueryAsync(trialCriterion.Id, x => new ReadingQuestionCriterionTrial()
{
SynchronizeTime = DateTime.Now
});
@ -192,6 +219,8 @@ namespace IRaCIS.Application.Services
}
}
}
/// <summary>
/// 获取项目裁判信息