Parcourir la source

增加答题卡类型字段,A3,A4

CrazyIter_Bin il y a 3 ans
Parent
commit
8d3a5eb330

+ 2 - 0
TEAMModelOS.SDK/Models/Cosmos/School/ExamInfo.cs

@@ -148,6 +148,8 @@ namespace TEAMModelOS.SDK.Models
         public List<int> field { get; set; } = new List<int>();
         public List<int> field { get; set; } = new List<int>();
         public  string  sheet { get; set; }        //public long sequenceNumber { get; set; }
         public  string  sheet { get; set; }        //public long sequenceNumber { get; set; }
         public string sheetNo { get; set; }        //public long sequenceNumber { get; set; }
         public string sheetNo { get; set; }        //public long sequenceNumber { get; set; }
+
+        public string mode { get; set; }
         //记录试卷作答时间
         //记录试卷作答时间
         public int time { get; set; } = 0;
         public int time { get; set; } = 0;
 
 

+ 1 - 0
TEAMModelOS/Controllers/Both/SheetConfigController.cs

@@ -159,6 +159,7 @@ namespace TEAMModelOS.Controllers.Common
                                 sheet.no = await SheetService.genSheetNo(client, _dingDing, _option, sheet.code, tbname, sheet.from);
                                 sheet.no = await SheetService.genSheetNo(client, _dingDing, _option, sheet.code, tbname, sheet.from);
                             }
                             }
                             ps.sheetNo = sheet.no;
                             ps.sheetNo = sheet.no;
+                            ps.mode = sheet.mode;
                             exam = await client.GetContainer(Constant.TEAMModelOS, "Common").ReplaceItemAsync<ExamInfo>(exam, $"{_examId}", new PartitionKey($"{code}"));
                             exam = await client.GetContainer(Constant.TEAMModelOS, "Common").ReplaceItemAsync<ExamInfo>(exam, $"{_examId}", new PartitionKey($"{code}"));
                         }
                         }
                         else
                         else

+ 4 - 4
TEAMModelOS/Controllers/Client/HiScanController.cs

@@ -323,13 +323,13 @@ namespace TEAMModelOS.Controllers.Core
                     {
                     {
                         if (exam.scope.Equals("school"))
                         if (exam.scope.Equals("school"))
                         {
                         {
-                            SheetConfig config = new SheetConfig { id = pap.sheet, no = pap.sheetNo, scope = exam.scope, code = $"SheetConfig-{exam.school}" };
+                            SheetConfig config = new SheetConfig { id = pap.sheet, no = pap.sheetNo, scope = exam.scope, mode = pap.mode, code = $"SheetConfig-{exam.school}" };
                             dys.Add(new PaperRcd { name = pap.name, answers = pap.answers, point = pap.point, sheet = config });
                             dys.Add(new PaperRcd { name = pap.name, answers = pap.answers, point = pap.point, sheet = config });
                             sheet.Add(config);
                             sheet.Add(config);
                         }
                         }
                         else
                         else
                         {
                         {
-                            SheetConfig config = new SheetConfig { id = pap.sheet, no = pap.sheetNo, scope = exam.scope, code = $"SheetConfig-{code}" };
+                            SheetConfig config = new SheetConfig { id = pap.sheet, no = pap.sheetNo, scope = exam.scope,mode=pap.mode , code = $"SheetConfig-{code}" };
                             dys.Add(new PaperRcd { name = pap.name, answers = pap.answers, point = pap.point, sheet = config });
                             dys.Add(new PaperRcd { name = pap.name, answers = pap.answers, point = pap.point, sheet = config });
                             sheet.Add(config);
                             sheet.Add(config);
                         }
                         }
@@ -520,12 +520,12 @@ namespace TEAMModelOS.Controllers.Core
                 {
                 {
                     if (exam.scope.Equals("school"))
                     if (exam.scope.Equals("school"))
                     {
                     {
-                        config = new SheetConfig { id = pap.sheet, scope = exam.scope, code = $"SheetConfig-{exam.school}" };
+                        config = new SheetConfig { id = pap.sheet, scope = exam.scope, mode = pap.mode, no = pap.sheetNo, code = $"SheetConfig-{exam.school}" };
                         paper = new PaperRcdData { name = pap.name, answers = pap.answers, point = pap.point };
                         paper = new PaperRcdData { name = pap.name, answers = pap.answers, point = pap.point };
                     }
                     }
                     else
                     else
                     {
                     {
-                        config = new SheetConfig { id = pap.sheet, scope = exam.scope, code = $"SheetConfig-{code}" };
+                        config = new SheetConfig { id = pap.sheet, scope = exam.scope, mode = pap.mode,no=pap.sheetNo, code = $"SheetConfig-{code}" };
                         paper = new PaperRcdData { name = pap.name, answers = pap.answers, point = pap.point };
                         paper = new PaperRcdData { name = pap.name, answers = pap.answers, point = pap.point };
                     }
                     }
                 }
                 }