zhouj1203@hotmail.com 2 лет назад
Родитель
Сommit
7594a9626b

+ 5 - 0
TEAMModelOS.FunctionV4/CosmosDB/TriggerArt.cs

@@ -341,6 +341,11 @@ namespace TEAMModelOS.FunctionV4.CosmosDB
                             {
                                 if (rs.totalScore == 0)
                                 {
+                                    /*foreach (var sc in rs.subjectScores) {
+                                        if (sc.score == 0) { 
+                                            
+                                        }
+                                    }*/
                                     rs.totalScore = Math.Round(rs.subjectScores.Where(m => m.score >= 0).Sum(z => z.score), 2);
                                     tasks.Add(client.GetContainer(Constant.TEAMModelOS, Constant.Student).ReplaceItemAsync(rs, rs.id, new PartitionKey(rs.code)));
                                 }                 

+ 1 - 1
TEAMModelOS.SDK/Models/Cosmos/Student/StudentArtResult.cs

@@ -32,7 +32,7 @@ namespace TEAMModelOS.SDK.Models
         /// </summary>
         public OAnswer zyanswer { get; set; } = new OAnswer();
         //0未作答 1已作答
-        public int isAnswer { get; set; } = 0;
+        //public int isAnswer { get; set; } = 0;
 
     }
     public class ArtSubjectScore {

+ 5 - 5
TEAMModelOS/Controllers/Common/ArtController.cs

@@ -167,7 +167,7 @@ namespace TEAMModelOS.Controllers.Common
                 {
                     using var json = await JsonDocument.ParseAsync(res.ContentStream);
                     artResult = json.ToObject<StudentArtResult>();
-                    artResult.isAnswer = isAnswer.GetInt32();
+                    //artResult.isAnswer = isAnswer.GetInt32();
                     await client.GetContainer("TEAMModelOS", "Student").ReplaceItemAsync(artResult, artResult.id, new PartitionKey($"{artResult.code}"));
                 }             
                 return Ok();
@@ -251,8 +251,7 @@ namespace TEAMModelOS.Controllers.Common
                             school = school,
                             userType = userType,
                             artId = request.artId,
-                            classIds = classIds,
-                            isAnswer = 0
+                            classIds = classIds
                         };
                         foreach (var qIds in art.settings)
                         {
@@ -1051,6 +1050,7 @@ namespace TEAMModelOS.Controllers.Common
                         zyUrl.Add((artResult.studentId, string.Empty));
                     }
                 }
+                //if (string.IsNullOrWhiteSpace(artResult.zyanswer.thirdAnswerId)) { }
                 if (subject.Equals("subject_music"))
                 {
                     var works = artResults.Select(x => new
@@ -1059,7 +1059,7 @@ namespace TEAMModelOS.Controllers.Common
                         x.studentName,
                         x.classIds,
                         x.artId,
-                        x.isAnswer,
+                        isAnswer = string.IsNullOrWhiteSpace(x.zyanswer.thirdAnswerId) ? 0 : 1,
                         attachments = x.results.Where(c => c.taskId.Equals(taskId.GetString())).FirstOrDefault().files,
                         zyUrl.Where(c => c.stuId.Equals(x.studentId)).FirstOrDefault().url
                     });
@@ -1072,7 +1072,7 @@ namespace TEAMModelOS.Controllers.Common
                         x.studentName,
                         x.classIds,
                         x.artId,
-                        x.isAnswer,
+                        isAnswer = string.IsNullOrWhiteSpace(x.zyanswer.thirdAnswerId) ? 0 : 1,
                         attachments = x.results.Where(c => c.taskId.Equals(taskId.GetString())).FirstOrDefault().files,
                     });
                     return Ok(new { works, code = 200 });