CrazyIter_Bin il y a 11 mois
Parent
commit
9f610b6621

+ 1 - 1
TEAMModelOS.SDK/DI/HttpTrigger/HttpTrigger.cs

@@ -63,7 +63,7 @@ namespace TEAMModelOS.SDK.DI
             }
             string link = domain.Contains("localhost") ? $"http://{domain}/api/{url}" : $"https://{domain}/api/{url}";
             HttpContent httpContent = new StringContent(data.ToJsonString());
-            _httpClient.Timeout=  TimeSpan.FromSeconds(30);
+           // _httpClient.Timeout=  TimeSpan.FromSeconds(30);
             HttpResponseMessage responseMessage = await _httpClient.PostAsync(link, httpContent);
             if (responseMessage.StatusCode == HttpStatusCode.OK)
             {

+ 4 - 0
TEAMModelOS.SDK/Models/Cosmos/School/Paper.cs

@@ -129,6 +129,10 @@ namespace TEAMModelOS.SDK.Models
         /// 0不保密,1 保密
         /// </summary>
         public int secret { get; set; }
+        /// <summary>
+        /// 阅卷模式:0默认,1阅卷专用
+        /// </summary>
+        public int markModel { get; set; }
     }
      /// <summary>
      /// 阅卷规则

+ 3 - 3
TEAMModelOS/Controllers/Both/PaperController.cs

@@ -111,7 +111,7 @@ namespace TEAMModelOS.Controllers
             var id = jwt.Payload.Sub;
             var client = _azureCosmos.GetCosmosClient();
             List<object> papers = new List<object>();
-            var query = $"select c.id,c.subjectCode,c.code,c.periodCode,c.name,c.itemCount,c.level,c.pointItem,c.pointScore,c.score,c.gradeCode,c.createTime,c.sheet,c.sheetNo,c.tags ,c.mode ,c.itemSort,c.qamode,c.attachments ,c.creatorId,c.secret from c where c.id = {id}";
+            var query = $"select c.id,c.subjectCode,c.code,c.periodCode,c.name,c.itemCount,c.level,c.pointItem,c.pointScore,c.score,c.gradeCode,c.createTime,c.sheet,c.sheetNo,c.tags ,c.mode ,c.itemSort,c.qamode,c.attachments ,c.creatorId,c.secret,c.markModel from c where c.id = {id}";
             await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIterator(queryText: query, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Paper-{school_code}") }))
             {
                 using var json = await JsonDocument.ParseAsync(item.ContentStream);
@@ -190,7 +190,7 @@ namespace TEAMModelOS.Controllers
                 {
                     permissions= (List<string>)_permissions;
                 }
-                sql.Append("select  c.id,c.code,c.name,c.blob,c.periodId,c.gradeIds,c.subjectId,c.subjectName,c.score,c.useCount,c.scope,c.scoring,c.createTime,c.sheet ,c.mode ,c.sheetNo, c.tags,c.itemSort,c.qamode,c.isCodeOption,c.attachments,c.creatorId,c.secret from c");
+                sql.Append("select  c.id,c.code,c.name,c.blob,c.periodId,c.gradeIds,c.subjectId,c.subjectName,c.score,c.useCount,c.scope,c.scoring,c.createTime,c.sheet ,c.mode ,c.sheetNo, c.tags,c.itemSort,c.qamode,c.isCodeOption,c.attachments,c.creatorId,c.secret ,c.markModel from c");
                 AzureCosmosQuery cosmosDbQuery = SQLHelper.GetSQL(dict, sql);
 
                 //if (rolse.Contains("admin"))
@@ -217,7 +217,7 @@ namespace TEAMModelOS.Controllers
             }
             if (scope.ToString().Equals("private"))
             {
-                sql.Append("select c.id,c.code,c.name,c.blob,c.subjectName,c.score,c.useCount,c.scope,c.scoring ,c.createTime ,c.sheet,c.sheetNo ,c.mode , c.tags, c.itemSort,c.qamode,c.isCodeOption,c.attachments,c.creatorId,c.secret from c");
+                sql.Append("select c.id,c.code,c.name,c.blob,c.subjectName,c.score,c.useCount,c.scope,c.scoring ,c.createTime ,c.sheet,c.sheetNo ,c.mode , c.tags, c.itemSort,c.qamode,c.isCodeOption,c.attachments,c.creatorId,c.secret,c.markModel from c");
                 AzureCosmosQuery cosmosDbQuery = SQLHelper.GetSQL(dict, sql);
                 await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Teacher").GetItemQueryIterator<Paper>(queryDefinition: cosmosDbQuery.CosmosQueryDefinition, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Paper-{code}") }))
                 {