修改附件类u下。

TEAMModelOS.SDK/Models/Cosmos/Common/Homework.cs

@@ -102,11 +102,7 @@ namespace TEAMModelOS.SDK.Models
         public List<Submits> teachers { get; set; } = new List<Submits>();
         public string recordUrl { get; set; }
     }
-    public class Attachment { 
-        public string name { get; set; }
-        public string url { get; set; }
-        public long size { get; set; }
-    }
+    
  
 
     public class Submits {

TEAMModelOS.SDK/Models/Cosmos/Common/Inner/ProcessRes.cs

@@ -9,7 +9,7 @@ namespace TEAMModelOS.SDK.Models
     /// 作业附件
     /// </summary>
     
-    public class ProcessRes
+    public class Attachment
     {
         /// <summary>
         /// 文件名字
@@ -44,6 +44,7 @@ namespace TEAMModelOS.SDK.Models
         /// </summary>
         
         public string type { get; set; }
+        public string blob { get; set; }
 
     }
 }

TEAMModelOS.SDK/Models/Cosmos/Common/LearnUnit.cs

@@ -15,7 +15,7 @@ namespace TEAMModelOS.SDK.Models
     {       
         public LearnUnit() {
             //syllabus = new List<string>();
-            resource = new List<ProcessRes>();
+            resource = new List<Attachment>();
             item = new List<ItemInfo>();
         }
         //创建时间 
@@ -27,7 +27,7 @@ namespace TEAMModelOS.SDK.Models
         /// <summary>
         /// 资源内容
         /// </summary>
-        public List<ProcessRes> resource { get; set; }
+        public List<Attachment> resource { get; set; }
         /// <summary>
         /// 题目
         /// </summary>

TEAMModelOS.SDK/Models/Cosmos/Student/HomeworkRecord.cs

@@ -8,185 +8,66 @@ using TEAMModelOS.SDK.Context.Attributes.Azure;
 
 namespace TEAMModelOS.SDK.Models
 {
-
     /// <summary>
     /// 作业数据
     /// </summary>    
     public class HomeworkRecord : CosmosEntity
     {
-        
-        public HomeworkRecord() {
-            content = new List<Content>();
-            stuCmt = new List<StudentComment>();
-          
-           // nativeroom = new ClassroomItem();
-            tchCmt = new HomeworkComment();
-        }        
-
-       
-
         /// <summary>
         /// 提交时间
         /// </summary>
         public long time { get; set; }
-
         /// <summary>
         /// 分数
         /// </summary>
         public double score { get; set; }
-
         /// <summary>
         /// 作业内容
         /// </summary>
-        public List<Content> content { get; set; }
-
-
-        /// <summary>
-        /// 作业评论 （同学互评）
-        /// </summary>
-        public List<StudentComment> stuCmt { get; set; }
-
-
+        public Content content { get; set; } 
         /// <summary>
         /// 教师评语
         /// </summary>
-        public HomeworkComment tchCmt { get; set; }
+        public List<HomeworkComment> comments { get; set; } = new List<HomeworkComment>();
     }
-    public class ClassroomItem {
-        public string name { get; set; }
-        public string code { get; set; }
-
-    }
-
     /// <summary>
     /// 作业内容
     /// </summary>
     public class Content {
-
         /// <summary>
         /// 作答记录
         /// </summary>
         public List<List<string>> answers { get; set; } = new List<List<string>>();
-
         /// <summary>
         ///  其他模式url 及name
         /// </summary>
-        public List<ProcessRes> resource { get; set; }
-
+        public List<Attachment> resource { get; set; } = new List<Attachment>();
     }
-
-
-    public class StudentComment
-    {
-        public StudentComment()
-        {
-            reply = new List<Reply>();
-        }
-
-        /// <summary>
-        /// 评论id
-        /// </summary>
-        public string commentid { get; set; }
-
-        /// <summary>
-        /// 评论者id 醍摩豆或studenId
-        /// </summary>
-        public string fromId { get; set; }
-
-        /// <summary>
-        /// 被评论者id 醍摩豆或studenId
-        /// </summary>
-        public string toId { get; set; }
-
-        /// <summary>
-        /// 学生打分
-        /// </summary>
-        public double? score { get; set; }
-
-        /// <summary>
-        /// 评论者身份 教师 学生
-        /// </summary>
-        public string identity { get; set; }
-
-        /// <summary>
-        /// 评语
-        /// </summary>
-        public string comment { get; set; }
-
-        /// <summary>
-        /// 评论时间
-        /// </summary>
-        public long createTime { get; set; }
-
-        ///// <summary>
-        ///// 评论回复
-        ///// </summary>
-        public List<Reply>  reply { get; set; }
-
-    }
-
-
-
     /// <summary>
     /// 作业评论
     /// </summary>
     public class HomeworkComment {
-       
-
-        /// <summary>
-        /// 评论者身份 教师 学生
-        /// </summary>
-        public string identity { get; set; }
-
-        /// <summary>
-        /// 评语
-        /// </summary>
-        public string comment { get; set; }
-
         /// <summary>
-        /// 评论时间
+        /// 身份类型  校内学生账号 student   醍摩豆账号 tmdid  
         /// </summary>
-        public long createTime { get; set; }
-
-
-        /// <summary>
-        /// 醍摩豆id 或者学生id
-        /// </summary>
-        public string TEAMModelId { get; set; }
-
-        ///// <summary>
-        ///// 评论回复
-        ///// </summary>
-        //public List<Reply>  reply { get; set; }
-
-    }
-
-    /// <summary>
-    /// 评论回复
-    /// </summary>
-    public class Reply
-    {
+        public string idtype { get; set; }
         /// <summary>
-        /// 评论者id 醍摩豆或studenId
+        /// 评论人的id
         /// </summary>
-        public string fromId { get; set; }
-
+        public string id { get; set; }
         /// <summary>
-        /// 被评论者id 醍摩豆或studenId
+        /// 评论人
         /// </summary>
-        public string toId { get; set; }
-
+        public string name { get; set; }
         /// <summary>
-        /// 评论者身份 教师 学生
+        /// 学校
         /// </summary>
-        public string identity { get; set; }
-
+        public string school { get; set; }
         /// <summary>
-        /// 评语
+        /// 评分
         /// </summary>
-        public string comment { get; set; }
-
-        public long createTime { get; set; }
-
+        public int score { get; set; } = -1;
+        public List<string> replyIds { get; set; } = new List<string>();
+        public long time { get; set; }
     }
 }

TEAMModelOS/Controllers/Common/HomeworkController.cs

@@ -406,6 +406,8 @@ namespace TEAMModelOS.Controllers.Learn
                 {
                         //提交答案
                     case bool when $"{_opt}".Equals("SubmitAnswer", StringComparison.OrdinalIgnoreCase):
+
+
                         break;
                         //评论
                     case bool when $"{_opt}".Equals("Comment", StringComparison.OrdinalIgnoreCase):

TEAMModelOS/Models/Dto/ItemInfoDto.cs

@@ -18,7 +18,7 @@ namespace TEAMModelOS.SDK.Models
             answer = new List<string>();
             points = new List<string>();
             gradeIds = new List<string>();
-            repairResource = new List<ProcessRes>();
+            repairResource = new List<Attachment>();
         }
         public string shaCode { get; set; }
         //题干
@@ -54,7 +54,7 @@ namespace TEAMModelOS.SDK.Models
         /// <summary>
         /// 补救资源
         /// </summary>
-        public List<ProcessRes> repairResource { get; set; }
+        public List<Attachment> repairResource { get; set; }