Li преди 2 години
родител
ревизия
3e0447330d
променени са 2 файла, в които са добавени 6 реда и са изтрити 6 реда
  1. 2 3
      TEAMModelBI/Controllers/Census/PaperController.cs
  2. 4 3
      TEAMModelBI/Models/ItemInfo.cs

+ 2 - 3
TEAMModelBI/Controllers/Census/PaperController.cs

@@ -144,7 +144,7 @@ namespace TEAMModelBI.Controllers.Census
                         BlobClient tempClient = oldBobCilent.GetBlobClient(blobItem.Name);
                         using (var meomoryStream = new MemoryStream())
                         {
-                            StringBuilder itemStr = new("[");
+                            StringBuilder itemStr = new();
                             BlobClient tempBlobClient = oldBobCilent.GetBlobClient(blobItem.Name);
                             BlobDownloadInfo download = tempBlobClient.Download();
                             var content = download.Content;
@@ -158,8 +158,6 @@ namespace TEAMModelBI.Controllers.Census
                                     else
                                         itemStr.Append($"{text.ToString()},");
                                 }
-
-                                itemStr.Append("]");
                                 streamReader.Close();
                             }
                             string input = itemStr.ToString();
@@ -169,6 +167,7 @@ namespace TEAMModelBI.Controllers.Census
                             //BlobItemInfo blobbItemInfo = Encoding.UTF8.GetString(meomoryStream.ToArray()).ToString().ToObject<BlobItemInfo>();
                             blobbItemInfo.exercise.periodId = cItem.newPrdId;
                             blobbItemInfo.exercise.gradeIds = cItem.newGrId;
+
                             blobbItemInfo.exercise.subjectId = cItem.newSubId;
 
                             var urlSas = _azureStorage.GetBlobSAS($"{cItem.newSc}", blobItem.Name, BlobSasPermissions.Read | BlobSasPermissions.List);   //获取容器sas和有效期

+ 4 - 3
TEAMModelBI/Models/ItemInfo.cs

@@ -1,5 +1,6 @@
 using DocumentFormat.OpenXml.Office2010.ExcelAc;
 using System.Collections.Generic;
+using TEAMModelOS.SDK.Models;
 
 namespace TEAMModelBI.Models
 {
@@ -21,17 +22,17 @@ namespace TEAMModelBI.Models
         public List<string> answer { get; set; }
         public string explain { get; set; }
         public string type { get; set; }
-        public string opts { get; set; }
+        public int opts { get; set; }
         public List<string> knowledge { get; set; }
         public int field { get; set; }
         public int level { get; set; }
         public string periodId { get; set; }
         public List<string> gradeIds { get; set; }
         public string subjectId { get; set; }
-        public List<string> children { get; set; }
+        public List<string> children { get; set; } = new List<string>();
         public string scope { get; set; }
         public int score { get; set; }
-        public List<string> repair { get; set; }
+        public List<Repair> repair { get; set; } = new List<Repair>();
     }
 
     public class Questions