Merge pull request 'dev' (#11) from dev into staging

Reviewed-on: #11

.gitea/workflows/push-master.yaml

@@ -35,16 +35,21 @@ jobs:
       volumes:
         - /opt/.runner/nuget_packages:/root/.nuget/packages
 
+    env:
+      run_cmd: |
+
+        cd D:/marking.cut.service/publish
+
+        start dotnet Dolphin.ExamPictureCut.HttpApi.Host.dll --URLS="http://*:30000"
+        start dotnet Dolphin.ExamPictureCut.HttpApi.Host.dll --URLS="http://*:30001"
+        start dotnet Dolphin.ExamPictureCut.HttpApi.Host.dll --URLS="http://*:30002"
+        start dotnet Dolphin.ExamPictureCut.HttpApi.Host.dll --URLS="http://*:30003"
+        start dotnet Dolphin.ExamPictureCut.HttpApi.Host.dll --URLS="http://*:30004"
+
     steps:
       - name: 下载源码
         uses: actions/checkout@v3
 
-      - name: 使用缓存
-        uses: actions/cache@master
-        with:
-          mount: |
-            node_modules
-
       - name: 编译后端
         uses: actions/aspnet@8.0
         with:
@@ -84,7 +89,12 @@ jobs:
             rm -rf marking.cut.service.tar.gz
             curl -O https://static.w.23544.com:8843/marking/marking.cut.service.tar.gz
             tar -zxvf marking.cut.service.tar.gz
-            curl "http://localhost:5244/publish/run?execPath=D:/marking.cut.service/publish/Dolphin.ExamPictureCut.HttpApi.Host.exe&count=2"
+            # curl "http://localhost:5244/publish/run?execPath=D:/marking.cut.service/publish/Dolphin.ExamPictureCut.HttpApi.Host.exe&count=2"
+
+            echo "${{ env.run_cmd }}"
+            echo "${{ env.run_cmd }}"> publish/run.cmd
+
+            curl "http://localhost:5244/publish/run?execPath=D:/marking.cut.service/publish/run.cmd&count=2"
 
       - name: 启动生产环境106
         uses: docker://appleboy/drone-ssh
@@ -101,7 +111,12 @@ jobs:
             rm -rf marking.cut.service.tar.gz
             curl -O https://static.w.23544.com:8843/marking/marking.cut.service.tar.gz
             tar -zxvf marking.cut.service.tar.gz
-            curl "http://localhost:5244/publish/run?execPath=D:/marking.cut.service/publish/Dolphin.ExamPictureCut.HttpApi.Host.exe&count=2"
+            # curl "http://localhost:5244/publish/run?execPath=D:/marking.cut.service/publish/Dolphin.ExamPictureCut.HttpApi.Host.exe&count=2"
+
+            echo "${{ env.run_cmd }}"
+            echo "${{ env.run_cmd }}"> publish/run.cmd
+
+            curl "http://localhost:5244/publish/run?execPath=D:/marking.cut.service/publish/run.cmd&count=2"
 
       - name: 发送构建通知
         if: ${{ always() }}

.gitea/workflows/release-version.yaml

@@ -22,6 +22,17 @@ jobs:
       volumes:
         - /opt/.runner/nuget_packages:/root/.nuget/packages
 
+    env:
+      run_cmd: |
+
+        cd D:/marking.cut.service/publish
+
+        start dotnet Dolphin.ExamPictureCut.HttpApi.Host.dll --URLS="http://*:30000"
+        start dotnet Dolphin.ExamPictureCut.HttpApi.Host.dll --URLS="http://*:30001"
+        start dotnet Dolphin.ExamPictureCut.HttpApi.Host.dll --URLS="http://*:30002"
+        start dotnet Dolphin.ExamPictureCut.HttpApi.Host.dll --URLS="http://*:30003"
+        start dotnet Dolphin.ExamPictureCut.HttpApi.Host.dll --URLS="http://*:30004"
+
     steps:
       - name: 下载源码
         uses: actions/checkout@v3
@@ -75,7 +86,12 @@ jobs:
             rm -rf marking.cut.service.tar.gz
             curl -O https://static.w.23544.com:8843/marking/marking.cut.service.tar.gz
             tar -zxvf marking.cut.service.tar.gz
-            curl "http://localhost:5244/publish/run?execPath=D:/marking.cut.service/publish/Dolphin.ExamPictureCut.HttpApi.Host.exe&count=2"
+            # curl "http://localhost:5244/publish/run?execPath=D:/marking.cut.service/publish/Dolphin.ExamPictureCut.HttpApi.Host.exe&count=2"
+
+            echo "${{ env.run_cmd }}"
+            echo "${{ env.run_cmd }}"> publish/run.cmd
+
+            curl "http://localhost:5244/publish/run?execPath=D:/marking.cut.service/publish/run.cmd&count=2"
 
       - name: 启动生产环境106
         uses: docker://appleboy/drone-ssh
@@ -92,7 +108,12 @@ jobs:
             rm -rf marking.cut.service.tar.gz
             curl -O https://static.w.23544.com:8843/marking/marking.cut.service.tar.gz
             tar -zxvf marking.cut.service.tar.gz
-            curl "http://localhost:5244/publish/run?execPath=D:/marking.cut.service/publish/Dolphin.ExamPictureCut.HttpApi.Host.exe&count=2"
+            # curl "http://localhost:5244/publish/run?execPath=D:/marking.cut.service/publish/Dolphin.ExamPictureCut.HttpApi.Host.exe&count=2"
+
+            echo "${{ env.run_cmd }}"
+            echo "${{ env.run_cmd }}"> publish/run.cmd
+
+            curl "http://localhost:5244/publish/run?execPath=D:/marking.cut.service/publish/run.cmd&count=2"
 
       - name: 发送构建通知
         if: ${{ always() }}

Dolphin.ExamPictureCut.Application/Exams/ExamManager.cs

@@ -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,11 +413,19 @@ dotPenOriginalImg:
                 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>()
                     .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();
+
                 // 新增
                 await DbBiz.Insertable(kgtDtls).ExecuteCommandAsync();
                 await DbBiz.Insertable(zgtDtls).ExecuteCommandAsync();

Dolphin.ExamPictureCut.HttpApi.Host/DolphinExamPictureCutHttpApiHostModule.cs

@@ -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);