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

稽查修改
continuous-integration/drone/push Build is passing Details

Test_HIR_Net8
he 2025-09-15 15:51:50 +08:00
parent 05244cdaf7
commit bab20666af
1 changed files with 38 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,5 @@
using IRaCIS.Core.Domain.Models; using Hangfire.Storage.Monitoring;
using IRaCIS.Core.Domain.Models;
using IRaCIS.Core.Domain.Share; using IRaCIS.Core.Domain.Share;
using IRaCIS.Core.Infrastructure; using IRaCIS.Core.Infrastructure;
using IRaCIS.Core.Infrastructure.Extention; using IRaCIS.Core.Infrastructure.Extention;
@ -2906,6 +2907,40 @@ namespace IRaCIS.Core.Infra.EFCore.Common
var visitTaskId = taskList.OrderByDescending(x => x.VisitTaskNum).FirstOrDefault()?.Id; var visitTaskId = taskList.OrderByDescending(x => x.VisitTaskNum).FirstOrDefault()?.Id;
var objList = new List<object>();
var questionAnswerList = taskQuestionAnswerList.Join(quesionList,
t => t.ReadingQuestionTrialId,
u => u.QuestionId,
(t, u) =>
new
{
TaskName = taskList.FirstOrDefault(k => k.Id == t.VisitTaskId)?.TaskName,
VisitTaskNum = taskList.FirstOrDefault(k => k.Id == t.VisitTaskId)?.VisitTaskNum,
Answer = Translationunit(u.AnswerType, u.Unit, u.CustomUnit, unitDataList, t.Answer),
u.DictionaryCode,
u.QuestionName,
u.QuestionEnName,
t.VisitTaskId,
u.ShowOrder,
}).OrderBy(t => t.VisitTaskNum).ThenBy(t => t.ShowOrder).ToList();
foreach (var item in taskList.OrderBy(x => x.VisitTaskNum))
{
var obj = new
{
TaskBlindName = item.TaskBlindName,
VisitQuestionAnswerList = questionAnswerList.Where(y=>y.VisitTaskId==item.Id).ToList(),
};
objList.Add(obj);
}
await InsertInspection<ReadingTaskQuestionAnswer>(cloneEntity, type, x => new InspectionConvertDTO() await InsertInspection<ReadingTaskQuestionAnswer>(cloneEntity, type, x => new InspectionConvertDTO()
{ {
VisitTaskId = visitTaskId, VisitTaskId = visitTaskId,
@ -2918,21 +2953,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common
}, new }, new
{ {
QuestionAnswerList = taskQuestionAnswerList.Join(quesionList, GlobalAnswerList = objList,
t => t.ReadingQuestionTrialId, QuestionAnswerList = questionAnswerList,
u => u.QuestionId,
(t, u) =>
new
{
TaskName = taskList.FirstOrDefault(k=>k.Id==t.VisitTaskId)?.TaskName,
VisitTaskNum = taskList.FirstOrDefault(k => k.Id == t.VisitTaskId)?.VisitTaskNum,
Answer = Translationunit(u.AnswerType, u.Unit, u.CustomUnit, unitDataList, t.Answer),
u.DictionaryCode,
u.QuestionName,
u.QuestionEnName,
u.ShowOrder
}).OrderBy(t => t.VisitTaskNum).ThenBy(t => t.ShowOrder).ToList()
,
TableQuestionAndAnswerList = tableQuesionAndAnswerList TableQuestionAndAnswerList = tableQuesionAndAnswerList
} }
); );