Compare commits

..

10 Commits

Author SHA1 Message Date
lyndonliu c67424492a fix: 查了再删
部署到开发环境 / 编译发布 (push) Successful in 3m39s Details
2024-03-29 18:05:49 +08:00
qxa f49825066a Merge pull request '修改启动cmd脚本' (#10) from dev into master
部署生产环境 / 发布版本 (push) Successful in 38s Details
部署生产环境 / 编译发布 (push) Successful in 2m17s Details
Reviewed-on: #10
2024-03-29 17:19:03 +08:00
qxa 8eac8de403 Merge pull request '修改发布脚本' (#9) from dev into master
部署生产环境 / 发布版本 (push) Successful in 31s Details
部署生产环境 / 编译发布 (push) Successful in 6m18s Details
Reviewed-on: #9
2024-03-29 16:58:59 +08:00
qxa e913a8a0d6 Merge pull request 'dev' (#8) from dev into master
部署生产环境 / 发布版本 (push) Successful in 15s Details
部署生产环境 / 编译发布 (push) Successful in 5m34s Details
Reviewed-on: #8
2024-03-29 16:24:40 +08:00
qxa 9218e69daa Merge pull request 'dev' (#6) from dev into master
部署生产环境 / 发布版本 (push) Successful in 46s Details
部署生产环境 / 编译发布 (push) Failing after 28s Details
Reviewed-on: #6
2024-03-29 15:51:54 +08:00
qxa fe390527ce Merge pull request 'staging' (#5) from staging into master
Reviewed-on: #5
2024-03-29 15:34:54 +08:00
yangqiang 4cf479f43c Merge pull request '11' (#4) from dev into staging
部署到测试环境 / 编译发布 (push) Has been cancelled Details
Reviewed-on: #4
2024-03-29 14:49:28 +08:00
yangqiang 521e6248f1 Merge pull request '修复时间问题' (#3) from dev into staging
部署到测试环境 / 编译发布 (push) Successful in 4m57s Details
Reviewed-on: #3
2024-03-29 14:41:06 +08:00
yangqiang b0f99b8058 Merge pull request '发版测试' (#2) from dev into staging
部署到测试环境 / 编译发布 (push) Successful in 4m39s Details
Reviewed-on: #2
2024-03-29 14:16:24 +08:00
qxa 32d79ea23b Merge pull request '修改生产环境配置' (#1) from dev into staging
部署到测试环境 / 编译发布 (push) Successful in 3m32s Details
Reviewed-on: #1
2024-03-29 09:45:47 +08:00
2 changed files with 12 additions and 4 deletions

View File

@ -413,11 +413,19 @@ dotPenOriginalImg:
await DbBiz.BeginTranAsync(); await DbBiz.BeginTranAsync();
// 删除 // 删除
await DbBiz.Deleteable<MkExamResult>().Where(w => w.ExamSubjectId == eto.ExamSubjectId && w.StudentNo == penSerial).ExecuteCommandAsync(); 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.Updateable<SubjectiveMarkingResult>() await DbBiz.Updateable<SubjectiveMarkingResult>()
.SetColumns(s => new SubjectiveMarkingResult { IsDeleted = true, UpdateDate = Clock.Now }) .SetColumns(s => new SubjectiveMarkingResult { IsDeleted = true, UpdateDate = Clock.Now })
.Where(w => w.ExamSubjectId == eto.ExamSubjectId && w.StudentExamNum == penSerial && w.IsDeleted == false) .Where(w => delSubjectiveIds.Contains(w.Id))
.ExecuteCommandAsync(); .ExecuteCommandAsync();
// 新增 // 新增
await DbBiz.Insertable(kgtDtls).ExecuteCommandAsync(); await DbBiz.Insertable(kgtDtls).ExecuteCommandAsync();
await DbBiz.Insertable(zgtDtls).ExecuteCommandAsync(); await DbBiz.Insertable(zgtDtls).ExecuteCommandAsync();

View File

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