Compare commits

..

No commits in common. "c67424492ad1001bbb968580f74ffaeba14c771f" and "23ac9dbd97d73a50661c048e64c5fbb1c963e035" have entirely different histories.

2 changed files with 4 additions and 12 deletions

View File

@ -105,7 +105,7 @@ public class ExamManager : DomainService, IExamManager
}).ToListAsync();
var gotoCount = 0;
dotPenOriginalImg:
dotPenOriginalImg:
var zgtSettingDtls = await DbBiz.Queryable<MarkingSettingSubjective>().Where(w => w.ExamSubjectId == eto.ExamSubjectId).ToListAsync();
// 割原题
@ -413,19 +413,11 @@ public class ExamManager : DomainService, IExamManager
await DbBiz.BeginTranAsync();
// 删除
var delObjectiveIds = await DbBiz.Queryable<MkExamResult>()
.Where(w => w.ExamSubjectId == eto.ExamSubjectId && w.StudentNo == penSerial)
.Select(s => s.Id).ToListAsync();
await DbBiz.Deleteable<MkExamResult>().Where(w => delObjectiveIds.Contains(w.Id)).ExecuteCommandAsync();
var delSubjectiveIds = await DbBiz.Queryable<SubjectiveMarkingResult>()
.Where(w => w.ExamSubjectId == eto.ExamSubjectId && w.StudentExamNum == penSerial && w.IsDeleted == false)
.Select(s => s.Id).ToListAsync();
await DbBiz.Deleteable<MkExamResult>().Where(w => w.ExamSubjectId == eto.ExamSubjectId && w.StudentNo == penSerial).ExecuteCommandAsync();
await DbBiz.Updateable<SubjectiveMarkingResult>()
.SetColumns(s => new SubjectiveMarkingResult { IsDeleted = true, UpdateDate = Clock.Now })
.Where(w => delSubjectiveIds.Contains(w.Id))
.Where(w => w.ExamSubjectId == eto.ExamSubjectId && w.StudentExamNum == penSerial && w.IsDeleted == false)
.ExecuteCommandAsync();
// 新增
await DbBiz.Insertable(kgtDtls).ExecuteCommandAsync();
await DbBiz.Insertable(zgtDtls).ExecuteCommandAsync();

View File

@ -63,7 +63,7 @@ public class DolphinExamPictureCutHttpApiHostModule : AbpModule
},
db =>
{
//db.QueryFilter.AddTableFilter<ISoftDelete>(s => s.IsDeleted == false);
db.QueryFilter.AddTableFilter<ISoftDelete>(s => s.IsDeleted == false);
var config = new SqlSugarConfig();
db.Aop.DataExecuting = config.DataExecuting(context.Services);