update

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

@@ -124,11 +124,11 @@ namespace TEAMModelOS.SDK.Models
 
 
     }
-    public class ActivityWebsiteDto :ActivityWebsite
+    public class ActivityWebsiteDto : ActivityWebsite
     {
         public string sas { get; set; }
         public ActivityWebsiteDto() { }
-        public ActivityWebsiteDto(ActivityWebsite website) { 
+        public ActivityWebsiteDto(ActivityWebsite website) {
             this.allowPublic = website.allowPublic;
             this.route = website.route;
             this.scope = website.scope;
@@ -141,16 +141,16 @@ namespace TEAMModelOS.SDK.Models
         }
     }
 
-    public class ActivityBanner { 
+    public class ActivityBanner {
         public string title { get; set; }
         public string subtitle { get; set; }
         /// <summary>
         /// 指向链接
         /// </summary>
         public string url { get; set; }
-       /// <summary>
-       /// 图片链接
-       /// </summary>
+        /// <summary>
+        /// 图片链接
+        /// </summary>
         public string blob { get; set; }
         /// <summary>
         /// 文件类型  video  image
@@ -199,8 +199,8 @@ namespace TEAMModelOS.SDK.Models
         /// 活动id
         /// </summary>
         public string activityId { get; set; }
-        public string schoolNmae { get; set;}
-       public List<InviteTeachers> inviteTeachers { get; set; } = new List<InviteTeachers>();
+        public string schoolNmae { get; set; }
+        public List<InviteTeachers> inviteTeachers { get; set; } = new List<InviteTeachers>();
     }
 
     public class ActivityInvitedSchool
@@ -209,9 +209,9 @@ namespace TEAMModelOS.SDK.Models
         public string name { get; set; }
         public string picture { get; set; }
     }
-    public class ActivityConfirmedSchool: ActivityInvitedSchool
+    public class ActivityConfirmedSchool : ActivityInvitedSchool
     {
-       
+
         /// <summary>
         /// 0 未确认，1已确认，用于区级发布， publish=1,joinMode=invite,学校可以去进行邀请某一些教师。
         /// </summary>
@@ -265,17 +265,17 @@ namespace TEAMModelOS.SDK.Models
     /// <summary>
     /// 存在Normal表
     /// </summary>
-    public class ReviewRule :CosmosEntity{
+    public class ReviewRule : CosmosEntity {
         public ReviewRule() {
             pk="ReviewRule";
-           
+
         }
         /// <summary>
         ///  code="ReviewRule-disposable"; 存为活动   code="ReviewRule-template"; 存为模板
         /// </summary>
         //id 为活动的id ,以此用于来推断 模板评审规则或者活动评审规则的来源
         [Required(ErrorMessage = "Required")]
-        public string name  { get; set; }
+        public string name { get; set; }
         /// <summary>
         /// "hbcn/区级id,areaId",
         /// </summary>
@@ -291,7 +291,7 @@ namespace TEAMModelOS.SDK.Models
         /// </summary>
         [Required(ErrorMessage = "Required")]
         public string type { get; set; }
-        public List<RuleConfig> configs { get; set; } = new List<RuleConfig>(); 
+        public List<RuleConfig> configs { get; set; } = new List<RuleConfig>();
         /// <summary>
         /// 模板来源 name 
         /// </summary>
@@ -301,9 +301,9 @@ namespace TEAMModelOS.SDK.Models
     public class RuleConfig {
         public string id { get; set; }
         public string pid { get; set; }
-        public string label {  get; set; }
+        public string label { get; set; }
         public string desc { get; set; }
-        public double score {  get; set; }
+        public double score { get; set; }
         public int order { get; set; }
         public List<string> cids { get; set; } = new List<string>();
     }
@@ -324,12 +324,12 @@ namespace TEAMModelOS.SDK.Models
         /// </summary>
         public int upsertAsTemplate { get; set; } = 0;
         public string sourceName { get; set; }
-        public List<RuleConfigTree> trees{ get; set; }
+        public List<RuleConfigTree> trees { get; set; }
 
     }
-    public class RuleConfigTree: RuleConfig
+    public class RuleConfigTree : RuleConfig
     {
-        
+
         public List<RuleConfigTree> children { get; set; } = new List<RuleConfigTree>();
     }
     public class ContestUpload
@@ -348,11 +348,11 @@ namespace TEAMModelOS.SDK.Models
         /// 是否由队长上传 0个人上传，1 队长上传
         /// </summary>
         public int captainUpload { get; set; }
-        public string desc { get; set;}
+        public string desc { get; set; }
     }
     public class ContestSign
     {
-       
+
         public List<string> field { get; set; } = new List<string>();
         /// <summary>
         /// 报名类型，0个人，1团队
@@ -365,7 +365,7 @@ namespace TEAMModelOS.SDK.Models
         /// </summary>
         public int limit { get; set; }
 
-        public List<ContestSignField> fields { get; set; }= new List<ContestSignField>();
+        public List<ContestSignField> fields { get; set; } = new List<ContestSignField>();
     }
     public class ContestSignField {
         /// <summary>
@@ -381,7 +381,7 @@ namespace TEAMModelOS.SDK.Models
         /// <summary>
         /// 单选，复选，下拉列表
         /// </summary>
-        public List<string> item { get; set; }= new List<string> ();
+        public List<string> item { get; set; } = new List<string>();
     }
     /// <summary>
     /// 在线培训模块的数据结构
@@ -402,7 +402,7 @@ namespace TEAMModelOS.SDK.Models
         /// "online", "submit", "exam"模块
         /// </summary>
         public List<string> modules { get; set; } = new List<string>();
-        public List<TrainingAbility> abilities { get; set; }= new List<TrainingAbility>();
+        public List<TrainingAbility> abilities { get; set; } = new List<TrainingAbility>();
         public TrainingOnline online { get; set; }
         public TrainingSubmit submit { get; set; }
         public TrainingExam exam { get; set; }
@@ -410,7 +410,7 @@ namespace TEAMModelOS.SDK.Models
         public long etime { get; set; }
     }
 
-    public class TrainingOnline 
+    public class TrainingOnline
     {
         /// <summary>
         /// //最少学习多少积分 
@@ -437,7 +437,7 @@ namespace TEAMModelOS.SDK.Models
         /// <summary>
         /// //学习完成获得积分,0-10
         /// </summary>
-        public int balance { get; set; } 
+        public int balance { get; set; }
         public string id { get; set; }
         /// <summary>
         ///新建字段 维度 对应 原来的 subjectId 学科
@@ -447,14 +447,14 @@ namespace TEAMModelOS.SDK.Models
         /// 标号 A1  A2 A3....
         /// </summary>
         public string no { get; set; }
-       
+
         /// <summary>
         /// 册别name
         /// </summary>
         [Required(ErrorMessage = "{0} 必须填写")]
         public string name { get; set; }
         public List<AbilityTask> abilityTasks { get; set; } = new List<AbilityTask>();
-       
+
         public string desc { get; set; }
         public string sug { get; set; }
         public List<AbilityStds> stds { get; set; } = new List<AbilityStds>();
@@ -485,7 +485,7 @@ namespace TEAMModelOS.SDK.Models
         public ResearchSign sign { get; set; }
         public ResearchExamLite examLite { get; set; }
         public ResearchHomework homework { get; set; }
-        public ResearchSurvey survey { get; set; }  
+        public ResearchSurvey survey { get; set; }
         public ResearchVote vote { get; set; }
     }
     public class ResearchSign
@@ -529,7 +529,7 @@ namespace TEAMModelOS.SDK.Models
     /// <summary>
     /// 本次活动的评审专家
     /// </summary>
-    
+
     public class ActivityExpert : CosmosEntity
     {
         /// <summary>
@@ -541,7 +541,9 @@ namespace TEAMModelOS.SDK.Models
         }
         public List<Expert> experts { get; set; } = new List<Expert>();
     }
-    public class Expert { 
+
+
+    public class Expert {
         public string id { get; set; }
         public string iname { get; set; }
         public string name { get; set; }
@@ -567,6 +569,8 @@ namespace TEAMModelOS.SDK.Models
         /// </summary>
         public List<string> modules { get; set; } = new List<string>();
     }
+
+
     public class ExpertSubject {
         /// <summary>
         /// 科目
@@ -586,7 +590,7 @@ namespace TEAMModelOS.SDK.Models
         /// <summary>
         /// 参赛模式 0 个人，1 团队（是否允许跨校）
         /// </summary>
-        public int contestType {  get; set; }
+        public int contestType { get; set; }
         /// <summary>
         /// 报名时间
         /// </summary>
@@ -595,26 +599,26 @@ namespace TEAMModelOS.SDK.Models
         /// 0未提交，1 已提交
         /// </summary>
         public int contestUpload { get; set; }
-        public string uploadType {  get; set; }
+        public string uploadType { get; set; }
         public long uploadTime { get; set; } = -1;
     }
 
     /// <summary>
     /// 教师报名数据,存放在Teacher
     /// </summary>
-    public class ActivityEnroll  :CosmosEntity {
+    public class ActivityEnroll : CosmosEntity {
         //id  教师id,
         //code ActivityEnroll-ActivityId
         //pk ActivityEnroll
         public string schoolId { get; set; }
-        public string schoolName {  get; set; }
-        public string tmdName {  get; set; }
+        public string schoolName { get; set; }
+        public string tmdName { get; set; }
         public string tmdPicture { get; set; }
         public string schoolPicture { get; set; }
         public EnrollContest contest { get; set; }
         public EnrollUpload upload { get; set; }
 
-        public string activityId {  get; set; }
+        public string activityId { get; set; }
     }
 
     public class EnrollContest
@@ -622,7 +626,7 @@ namespace TEAMModelOS.SDK.Models
         /// <summary>
         /// 报名时间
         /// </summary>
-        public long  enrollTime { get; set; }
+        public long enrollTime { get; set; }
         /// <summary>
         /// 参赛模式 0 个人，1 团队（是否允许跨校）
         /// </summary>
@@ -642,10 +646,10 @@ namespace TEAMModelOS.SDK.Models
         /// </summary>
         public List<EnrollInfo> enrollInfos { get; set; } = new List<EnrollInfo>();
 
-      
+
     }
 
-   public class TeacherEnrollContestDto
+    public class TeacherEnrollContestDto
     {
         //[Required(ErrorMessage = "Required")]
         //public string activityId { get; set; }
@@ -671,25 +675,116 @@ namespace TEAMModelOS.SDK.Models
         /// </summary>
         public List<EnrollInfo> enrollInfos { get; set; } = new List<EnrollInfo>();
     }
-    public class EnrollUpload 
+    public class TeacherUploadContestDto {
+        public List<ContestAttachment> files { get; set; } = new List<ContestAttachment>();
+        public List<ContestSokrates> sokrates { get; set; } = new List<ContestSokrates>();
+        /// <summary>
+        /// file  sokrates
+        /// </summary>
+        public string type { get; set; }
+        public string schoolId { get; set; }
+        public string schoolName { get; set; }
+        public string schoolPicture { get; set; }
+    }
+
+    public class EnrollUpload
     {
-        public long uploadTime {  get; set; }
-        public List<Attachment> files { get; set; } = new List<Attachment>();
-        public List<EnrolSokrates> sokrates { get; set; } = new List<EnrolSokrates>();
+        public long uploadTime { get; set; }
+        public List<ContestAttachment> files { get; set; } = new List<ContestAttachment>();
+        public List<ContestSokrates> sokrates { get; set; } = new List<ContestSokrates>();
         /// <summary>
         /// file  sokrates
         /// </summary>
-        public string type { get; set; } 
+        public string type { get; set; }
         /// <summary>
         ///作品id
         /// </summary>
         public string uploadId { get; set; }
         /// <summary>
-        /// 分数 -1未评分
+        /// 真实分数 -1未评分
         /// </summary>
         public double score { get; set; } = -1;
+        /// <summary>
+        /// 掩饰分数 -1未评分
+        /// </summary>
+        public double maskScore { get; set; } = -1;
+    }
+    /// <summary>
+    /// 专家分配的任务
+    /// </summary>
+    public class ActivityExpertTask:CosmosEntity
+    {
+        //id  教师id,
+        //code  ActivityExpertTask-活动id
+
+      
+    }
+    /// <summary>
+    /// 专家在优课评选模块的任务分配
+    /// </summary>
+    public class ExpertContestTask { 
+        public List<ContestExpert> experts { get; set; }
+
+    
+    }
+    public class ContestExpert {
+        public string tmdid { get; set; }
+        public string name { get; set; }
+        public string picture { get; set; }
+        public int status { get; set; } = -1;
+        public double score { get; set; } = -1;
+    }
+
+    public class ExpertDto : Expert
+    {
+
     }
-    public class EnrolSokrates { 
+
+    public class ContestAttachment
+    {
+        /// <summary>
+        /// 文件名字
+        /// </summary>
+        public string name { get; set; }
+        /// <summary>
+        /// 完整路径
+        /// </summary>
+        public string url { get; set; }
+        /// <summary>
+        /// 文件大小
+        /// </summary>
+        public long size { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public long createTime { get; set; }
+        /// <summary>
+        /// 文件后缀
+        /// </summary>
+        public string extension { get; set; }
+        /// <summary>
+        /// 文件类型
+        /// </summary>
+        public string type { get; set; }
+        public string blob { get; set; }
+        public string hash { get; set; }
+        /// <summary>
+        /// 视频播放时长
+        /// </summary>
+        public double duration { get; set; }
+        /// <summary>
+        /// blob的容器名称
+        /// </summary>
+        public string cnt { get; set; }
+        /// <summary>
+        /// 创建者
+        /// </summary>
+        public long creator { get; set; }
+        public List<string> tag { get; set; } = new List<string>();
+    }
+
+    public class ContestSokrates
+    { 
         public string name { get; set; }
         public  string url {  get; set; }
         /// <summary>
@@ -708,6 +803,10 @@ namespace TEAMModelOS.SDK.Models
         /// 封面
         /// </summary>
         public string poster { get; set; }
+        /// <summary>
+        /// 教师id 
+        /// </summary>
+        public string tmdid {  get; set; }
 
     }
     /// <summary>