Browse Source

将state改为status

CrazyIter 4 years ago
parent
commit
9f4f8dd076

+ 3 - 0
TEAMModelOS.Service/Models/SchoolInfo/Course.cs

@@ -48,6 +48,9 @@ namespace TEAMModelOS.Service.Models
         /// 学段编码
         /// </summary>
         public string periodCode { get; set; }
+        /// <summary>
+        /// 任课教师范围
+        /// </summary>
         public List<string> teachers { get; set; }
 
     }

+ 2 - 1
TEAMModelOS.Service/Models/SchoolInfo/ExamInfo.cs

@@ -46,7 +46,8 @@ namespace TEAMModelOS.Service.Models
         /// 发布
         /// </summary>
         public string publish { get; set; }
-        public int state { get; set; }
+
+        public int status { get; set; }
         /// <summary>
         ///考试类型 段考 stage  联考 union 平常考 normal 其他 other
         /// </summary>

+ 5 - 1
TEAMModelOS.Service/Models/SchoolInfo/Inner/Answer.cs

@@ -15,12 +15,16 @@ namespace TEAMModelOS.Service.Models
         /// </summary>
         public int group { get; set; }
         /// <summary>
+        /// 类型 Single单选,Multiple多选,Judge判断,Complete填空,Subjective问答,
+        /// </summary>
+        public string type { get; set; }
+        /// <summary>
         /// 答案内容  多选 
         /// </summary>
         public List<string> ans { get; set; }
         /// <summary>
         /// 分值
         /// </summary>
-        public double score { get; set; }
+        public double? score { get; set; }
     }
 }

+ 23 - 6
TEAMModelOS.Service/Models/SchoolInfo/Paper.cs

@@ -7,7 +7,7 @@ using TEAMModelOS.SDK.Context.Attributes.Azure;
 using TEAMModelOS.SDK.Module.AzureCosmosDBV3;
 
 namespace TEAMModelOS.Service.Models
-{ 
+{
     /// <summary>
     /// 试卷信息
     /// </summary>
@@ -28,8 +28,8 @@ namespace TEAMModelOS.Service.Models
 
         [JsonProperty(PropertyName = "id")]
         public string id { get; set; }
-     
-    
+
+
         public List<ItemInfo> item { get; set; }
         public string subjectCode { get; set; }
         public string periodCode { get; set; }
@@ -37,7 +37,7 @@ namespace TEAMModelOS.Service.Models
         public string name { get; set; }
         public int itemCount { get; set; }
         public double level { get; set; }
-        public double score { get; set; }     
+        public double score { get; set; }
         /// <summary>
         /// type:{
         ///     pointkey:[num1,num2....]
@@ -51,10 +51,27 @@ namespace TEAMModelOS.Service.Models
         /// 正确答案
         /// </summary>
         public List<Answer> answers { get; set; }
+        public MarkConfig markConfig { get; set; }
 
     }
-
-    
+    /// <summary>
+    /// 阅卷规则
+    /// </summary>
+    public class MarkConfig
+    {
+        /// <summary>
+        /// 客观题是否自动阅卷
+        /// </summary>
+        public bool auto { get; set; }
+        /// <summary>
+        /// 多选 0不允许自动阅卷,1多选漏选不得分,2多选漏选得一半的分数(默认),3多选漏选按选择个数得分,4多选漏选指定分数
+        /// </summary>
+        public int type { get; set; } = 2;
+        /// <summary>
+        /// 多选漏选指定得分
+        /// </summary>
+        public double? score { get; set; } = 0;
+    }
     public class ScoreItem
     {
         public ScoreItem()

+ 1 - 1
TEAMModelOS.Service/Models/SchoolInfo/Survey.cs

@@ -26,7 +26,7 @@ namespace TEAMModelOS.Service.Models
         public string name { get; set; }   //测试问卷名称', // 问卷名称
         public string description { get; set; }   //测试问卷描述', // 问卷描述
         public string type { get; set; }   //normal', // 问卷类型
-        public int state { get; set; } // 问卷状态(100:待发布 200:已发布 300:已结束)
+        public int status { get; set; } // 问卷状态(100:待发布 200:已发布 300:已结束)
         /// <summary>
         /// 发布对象
         /// </summary>

+ 1 - 1
TEAMModelOS.Service/Models/SchoolInfo/Vote.cs

@@ -81,7 +81,7 @@ namespace TEAMModelOS.Service.Models
         /// 状态 (100:待发布 200:已发布 300:已结束)
         /// </summary>
         [ProtoMember(10)]
-        public int state { get; set; }
+        public int status { get; set; }
 
 
         /// <summary>

+ 23 - 1
TEAMModelOS.Service/Models/StudentInfo/ExamRecord.cs

@@ -1,10 +1,11 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 using System.Text;
 using TEAMModelOS.SDK.Context.Attributes.Azure;
 using TEAMModelOS.SDK.Module.AzureCosmosDBV3;
 
-namespace TEAMModelOS.Service.Models.StudentInfo
+namespace TEAMModelOS.Service.Models
 {
     [CosmosDB(RU = 400, Name = "Student")]
     public class ExamRecord : ID
@@ -14,12 +15,33 @@ namespace TEAMModelOS.Service.Models.StudentInfo
         /// <summary>
         /// 试卷id
         /// </summary>
+        [Required(ErrorMessage = "{0} 必须填写")]
         public string id { get; set; }
         /// <summary>
         /// 学生id
         /// </summary>
         [PartitionKey]
+        [Required(ErrorMessage = "{0} 必须填写")]
         public string code { get; set; }
+        /// <summary>
+        /// 考试code
+        /// </summary>
+        [PartitionKey]
+        [Required(ErrorMessage = "{0} 必须填写")]
+        public string examCode { get; set; }
+        /// <summary>
+        /// 0 未作答,白卷,  1已作答
+        /// </summary>
+        [Required(ErrorMessage = "参考状态必须填写")]
+        public int status { get; set; }
         public List<Answer> answers{ get; set; }
+        /// <summary>
+        /// 阅卷状态 0 未阅卷,1未完成阅卷,2完成阅卷
+        /// </summary>
+        public int mark { get; set; } = 0;
+        /// <summary>
+        /// 总分
+        /// </summary>
+        public double? score { get; set; } = 0;
     }
 }

+ 1 - 1
TEAMModelOS.Service/Models/TeacherInfo/Homework.cs

@@ -84,7 +84,7 @@ namespace TEAMModelOS.Service.Models
         /// 状态 (100:待发布 200:已发布 300:已结束)
         /// </summary>
         [ProtoMember(10)]
-        public int state { get; set; }
+        public int status { get; set; }
 
         //public Subdto subdto { get; set; }
 

+ 1 - 1
TEAMModelOS.Service/Services/Learn/Implements/TimerWorkService.cs

@@ -35,7 +35,7 @@ namespace TEAMModelOS.Service.Services.Learn.Implements
             List<T> homeWorks = await _cosmos.FindByDict<T>(dict);
             if (homeWorks.IsNotEmpty())
             {
-                PropertyInfo propertyInfo = homeWorks[0].GetType().GetProperty("state");
+                PropertyInfo propertyInfo = homeWorks[0].GetType().GetProperty("status");
                 for (int i = 0; i < homeWorks.Count; i++)
                     propertyInfo.SetValue(homeWorks[i], status);
                 await _cosmos.SaveOrUpdateAll<T>(homeWorks);

+ 67 - 14
TEAMModelOS.Service/TEAMModelOS.Model.xml

@@ -436,11 +436,6 @@
             课程编码
             </summary>
         </member>
-        <member name="P:TEAMModelOS.Service.Models.Course.semesterCode">
-            <summary>
-            学期编码
-            </summary>
-        </member>
         <member name="P:TEAMModelOS.Service.Models.Course.subjectCode">
             <summary>
             科目编码
@@ -451,6 +446,11 @@
             学段编码
             </summary>
         </member>
+        <member name="P:TEAMModelOS.Service.Models.Course.teachers">
+            <summary>
+            任课教师范围
+            </summary>
+        </member>
         <member name="T:TEAMModelOS.Service.Models.ExamAnswer">
             <summary>
             考生作答信息
@@ -482,13 +482,18 @@
             </summary>
         </member>
         <member name="P:TEAMModelOS.Service.Models.ExamInfo.type">
+             <summary>
+            考试类型 段考 stage  联考 union 平常考 normal 其他 other
+             </summary>
+        </member>
+        <member name="P:TEAMModelOS.Service.Models.Condition.range">
             <summary>
-            周考,期初考,期中考,期末考,诊断测验,模拟测验
+            评测范围 class 班级测验,年级测验 grade , 区级测验 distric
             </summary>
         </member>
-        <member name="P:TEAMModelOS.Service.Models.Condition.feedBackType">
+        <member name="P:TEAMModelOS.Service.Models.Condition.source">
             <summary>
-            评测来源
+            feedBackType ==>>source 评测来源 考试阅卷 marking ,互动课堂 teach ,线上评测 exam ,手动录入import
             </summary>
         </member>
         <member name="P:TEAMModelOS.Service.Models.Condition.subject">
@@ -501,6 +506,26 @@
             考试成绩信息
             </summary>
         </member>
+        <member name="P:TEAMModelOS.Service.Models.Answer.num">
+            <summary>
+            答案序号
+            </summary>
+        </member>
+        <member name="P:TEAMModelOS.Service.Models.Answer.group">
+            <summary>
+            题目序号对应多个答案序号
+            </summary>
+        </member>
+        <member name="P:TEAMModelOS.Service.Models.Answer.ans">
+            <summary>
+            答案内容  多选 
+            </summary>
+        </member>
+        <member name="P:TEAMModelOS.Service.Models.Answer.score">
+            <summary>
+            分值
+            </summary>
+        </member>
         <member name="T:TEAMModelOS.Service.Models.Paper">
             <summary>
             试卷信息
@@ -518,11 +543,9 @@
             }
             </summary>
         </member>
-        <member name="P:TEAMModelOS.Service.Models.Paper.pointScore">
+        <member name="P:TEAMModelOS.Service.Models.Paper.answers">
             <summary>
-            pointkey:{
-                
-            }
+            正确答案
             </summary>
         </member>
         <member name="P:TEAMModelOS.Service.Models.School.timetable">
@@ -610,7 +633,7 @@
             投票附件
             </summary>
         </member>
-        <member name="P:TEAMModelOS.Service.Models.Vote.state">
+        <member name="P:TEAMModelOS.Service.Models.Vote.status">
             <summary>
             状态 (100:待发布 200:已发布 300:已结束)
             </summary>
@@ -640,6 +663,36 @@
             学生id
             </summary>
         </member>
+        <member name="P:TEAMModelOS.Service.Models.ExamRecord.id">
+            <summary>
+            试卷id
+            </summary>
+        </member>
+        <member name="P:TEAMModelOS.Service.Models.ExamRecord.code">
+            <summary>
+            学生id
+            </summary>
+        </member>
+        <member name="P:TEAMModelOS.Service.Models.ExamRecord.examCode">
+            <summary>
+            考试code
+            </summary>
+        </member>
+        <member name="P:TEAMModelOS.Service.Models.ExamRecord.status">
+            <summary>
+            0 未参考,1参考
+            </summary>
+        </member>
+        <member name="P:TEAMModelOS.Service.Models.ExamRecord.mark">
+            <summary>
+            阅卷状态 0 未阅卷,1未完成阅卷,2完成阅卷
+            </summary>
+        </member>
+        <member name="P:TEAMModelOS.Service.Models.ExamRecord.score">
+            <summary>
+            总分
+            </summary>
+        </member>
         <member name="T:TEAMModelOS.Service.Models.HomeworkRecord">
             <summary>
             作业数据
@@ -992,7 +1045,7 @@
             作业附件
             </summary>
         </member>
-        <member name="P:TEAMModelOS.Service.Models.Homework.state">
+        <member name="P:TEAMModelOS.Service.Models.Homework.status">
             <summary>
             状态 (100:待发布 200:已发布 300:已结束)
             </summary>

+ 182 - 7
TEAMModelOS/Controllers/Exam/ExamController.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using TEAMModelOS.Models;
+using TEAMModelOS.SDK.Context.Exception;
 using TEAMModelOS.SDK.Extension.DataResult.JsonRpcRequest;
 using TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse;
 using TEAMModelOS.SDK.Helper.Common.CollectionHelper;
@@ -38,23 +39,23 @@ namespace TEAMModelOS.Controllers
             if (string.IsNullOrEmpty(request.@params.id))
             {
                 request.@params.id = Guid.NewGuid().ToString();
-                request.@params.state = 100;
+                request.@params.status = 100;
                 // await cosmosDBV3Repository.SaveOrUpdate(request.@params);
             }
             if (request.@params.publish.Equals("0"))
             {
                 request.@params.startTime = new DateTimeOffset(DateTime.UtcNow).ToUnixTimeMilliseconds();
-                request.@params.state = 200;
+                request.@params.status = 200;
             }
             else if (request.@params.publish.Equals("1"))
             {
                 //设定开始时间
               //  _timerWorkService.TimerWork<ExamInfo>(request.@params.startTime, 200, new Dictionary<string, object> { { "id", request.@params.id } });
             }
-            if (request.@params.state == 0)
+            if (request.@params.status == 0)
             {
-                if (request.@params.startTime < new DateTimeOffset(DateTime.UtcNow).ToUnixTimeMilliseconds()) request.@params.state = 200;
-                else request.@params.state = 100;
+                if (request.@params.startTime < new DateTimeOffset(DateTime.UtcNow).ToUnixTimeMilliseconds()) request.@params.status = 200;
+                else request.@params.status = 100;
             }
             await cosmosDBV3Repository.SaveOrUpdate(request.@params);
             //设定结束时间
@@ -90,10 +91,184 @@ namespace TEAMModelOS.Controllers
             else {
                 return builder.build();
             }
-          
         }
-       
+        /// <summary>
+        /// 教师阅卷
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [HttpPost("marking")]
+        public async Task<BaseJosnRPCResponse> Marking(JosnRPCRequest<ExamRecord> request)
+        {
+            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            //判断是否每一个题目都有分数
+            List<ExamInfo> exams = await cosmosDBV3Repository.FindByDict<ExamInfo>(new Dictionary<string, object> { { "id", request.@params.examCode } });
+
+            if (exams.IsNotEmpty())
+            {
+                ExamInfo examInfo = exams[0];
+                //提交答案时间必须是状态已发布,且时间在起止时间内
+                if ( examInfo.status == 300 &&
+                   examInfo.endTime <= new DateTimeOffset(DateTime.UtcNow).ToUnixTimeMilliseconds())
+                {
+                    return builder.Data(await cosmosDBV3Repository.SaveOrUpdate(request.@params)).build();
+                }
+                else
+                {
+                    throw new BizException("请在作答时间段内提交答案!", ResponseCode.FAILED);
+                }
+            }
+            else
+            {
+                throw new BizException("考试不存在!", ResponseCode.DATA_EXIST);
+            }
+        }
+
+        /// <summary>
+        /// 学生回答问题
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [HttpPost("answer")]
+        public async Task<BaseJosnRPCResponse> Answer(JosnRPCRequest<ExamRecord> request)
+        {
+            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            //要先处理状态,判断卷子是否存在,并判断卷子归属的考试是否允许再次提交
+            List<ExamInfo> exams=  await cosmosDBV3Repository.FindByDict<ExamInfo>(new Dictionary<string, object> { { "id", request.@params.examCode } });
+            if (exams.IsNotEmpty())
+            {
+                ExamInfo examInfo = exams[0];
+                //提交答案时间必须是状态已发布,且时间在起止时间内
+                if (examInfo.startTime <= new DateTimeOffset(DateTime.UtcNow).ToUnixTimeMilliseconds() && examInfo.status == 200 &&
+                   examInfo.endTime >= new DateTimeOffset(DateTime.UtcNow).ToUnixTimeMilliseconds())
+                {
+                    return builder.Data(await cosmosDBV3Repository.SaveOrUpdate(request.@params)).build();
+                }
+                else
+                {
+                    throw new BizException("请在作答时间段内提交答案!", ResponseCode.FAILED);
+                }
+            }
+            else {
+                throw new BizException("考试不存在!", ResponseCode.DATA_EXIST);
+            }
+        }
 
+        /// <summary>
+        /// 查询作答摘要信息
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [HttpPost("findSummaryRecord")]
+        public async Task<BaseJosnRPCResponse> findSummaryRecord(JosnRPCRequest<Dictionary<string,object>> request)
+        {
+            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            // 如果只有学生id则返回学生参加过的考试 只返回相关摘要信息
+            if (request.@params.Keys.Count == 1 && request.@params.ContainsKey("code"))
+            {
+                List<string> props = new List<string> { "id", "code", "examCode", "status", "mark", "score" };
+                List<ExamRecord> examRecords = await cosmosDBV3Repository.FindByDict<ExamRecord>(request.@params, props);
+                return builder.Data(examRecords).Extend(new Dictionary<string, object> { { "props", props } }).build();
+            }
+            else {
+                if (request.@params.ContainsKey("examCode"))
+                {
+                    List<string> props = new List<string> { "id", "code", "examCode", "status", "mark", "score" };
+                    List<ExamRecord> examRecords = await cosmosDBV3Repository.FindByDict<ExamRecord>(request.@params, props);
+                    return builder.Data(examRecords).Extend(new Dictionary<string, object> { { "props", props } }).build();
+                }
+                else {
+                    throw new BizException("参数错误",ResponseCode.PARAMS_ERROR);
+                }
+            }
+        }
+        /// <summary>
+        /// 查询单个作答信息  试卷id ,
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [HttpPost("findByIdPk")]
+        public async Task<BaseJosnRPCResponse> findByIdPk(JosnRPCRequest<IdPk> request)
+        {
+            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ExamRecord record = await cosmosDBV3Repository.FindByIdPk<ExamRecord>(request.@params.id,request.@params.pk);
+            if (record != null) {
+                //处理客观题自动阅卷
+                Paper paper = await cosmosDBV3Repository.FindByIdPk<Paper>(record.id, record.examCode);
+                if (paper.markConfig != null && paper.markConfig.auto) {
+                    autoMark(paper.item, paper.answers, record.answers, paper.markConfig);
+                }
+            }
+            return builder.Data(record).build();
+        }
+
+        public void autoMark(List<ItemInfo> items ,List<Answer> stdAnswers, List<Answer> stuAnswers ,MarkConfig markConfig) {
+            int size = stuAnswers.Count;
+            for (int i = 0; i < size; i++) {
+                //客观题
+                if (stuAnswers[i].type.Equals("Single") || stuAnswers[i].type.Equals("Multiple") || stuAnswers[i].type.Equals("Judge")) {
+                    //多选题单独处理
+                    if (stuAnswers[i].type.Equals("Multiple"))
+                    {
+                        List<string> stuAns = stuAnswers[i].ans;
+                        Answer stdAnswer = stdAnswers.Where(x =>x.num== stuAnswers[i].num).FirstOrDefault();
+                        if (stdAnswer != null) {
+                            //处理多选答案是否有选错的 选错的则直接0分 ,如果少选则处理部分分数
+                            bool right = true;
+                            List<string> rightStr = new List<string>();
+                            if (stuAns.IsNotEmpty())
+                            {
+                                foreach (string stuAn in stuAns)
+                                {
+                                    if (!stdAnswer.ans.Contains(stuAn))
+                                    {
+                                        right = false;
+                                        break;
+                                    }
+                                    else {
+                                        rightStr.Add(stuAn);
+                                    }
+                                }
+                            }
+                            else {
+                                right = false;
+                            }
+                            if (right && rightStr.IsNotEmpty() && rightStr.Count != stdAnswer.ans.Count)
+                            {
+
+                                if (markConfig.type == 1)
+                                {
+                                    //1多选漏选不得分
+                                    stuAnswers[i].score = 0;
+                                }
+                                else if(markConfig.type==3){
+                                    stuAnswers[i].score=Math.Floor((double)(1.0 * rightStr.Count / stdAnswer.ans.Count * stdAnswer.score));
+                                    if (stuAnswers[i].score == 0) {
+                                        stuAnswers[i].score = 1;
+                                    }
+                                }
+                                else if (markConfig.type == 4)
+                                {
+                                    stuAnswers[i].score = markConfig.score;
+                                }
+                                else
+                                {   //2多选漏选得一半的分数(默认)
+                                    stuAnswers[i].score = stdAnswer.score/2;
+
+                                }
+                            }
+                            else {
+                                //选错不得分
+                                stuAnswers[i].score = 0;
+                            }
+                        }
+                    }
+                    else { 
+                    
+                    }
+                }
+            }
+        }
         /// <summary>
         /// 生成题目
         /// </summary>

+ 1 - 2
TEAMModelOS/Controllers/Exam/PaperController.cs

@@ -84,8 +84,7 @@ namespace TEAMModelOS.Controllers
             JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
             if (string.IsNullOrEmpty(request.@params.id))
             {
-                request.@params.id = Guid.NewGuid().ToString();
-                //request.@params.state = 100;
+                request.@params.id = Guid.NewGuid().ToString(); 
                 request.@params.createTime = new DateTimeOffset(DateTime.UtcNow).ToUnixTimeSeconds();
                 await cosmosDBV3Repository.SaveOrUpdate(request.@params);
             }

+ 6 - 6
TEAMModelOS/Controllers/Task/HomeworkController.cs

@@ -55,7 +55,7 @@ namespace TEAMModelOS.Controllers.Learn
 
             foreach (Homework homeWork in homeWorks)
             {
-                homeWork.state = 100;
+                homeWork.status = 100;
             }
             List<Homework> homeWorks1 = await _cosmos.UpdateAll<Homework>(homeWorks);
 
@@ -103,7 +103,7 @@ namespace TEAMModelOS.Controllers.Learn
 
             {
                 request.@params.homeWork.id = Guid.NewGuid().ToString();
-                request.@params.homeWork.state = 100;
+                request.@params.homeWork.status = 100;
                 request.@params.reset = true;
                 request.@params.homeWork.createTime = new DateTimeOffset(DateTime.UtcNow).ToUnixTimeSeconds();
             }
@@ -112,7 +112,7 @@ namespace TEAMModelOS.Controllers.Learn
             if (request.@params.homeWork.publishModel.Equals("0"))
             {
                 request.@params.homeWork.startTime = new DateTimeOffset(DateTime.UtcNow).ToUnixTimeMilliseconds();
-                request.@params.homeWork.state = 200;
+                request.@params.homeWork.status = 200;
             }
             else if (request.@params.homeWork.publishModel.Equals("1"))
             {
@@ -133,10 +133,10 @@ namespace TEAMModelOS.Controllers.Learn
                 _timerWorkService.TimerWork<Homework>(request.@params.homeWork.startTime,200, new Dictionary<string, object> { { "id", request.@params.homeWork.id } });
             }
 
-            if (request.@params.homeWork.state == 0) {
+            if (request.@params.homeWork.status == 0) {
 
-                if (request.@params.homeWork.startTime < new DateTimeOffset(DateTime.UtcNow).ToUnixTimeMilliseconds()) request.@params.homeWork.state = 200;
-                else  request.@params.homeWork.state = 100;
+                if (request.@params.homeWork.startTime < new DateTimeOffset(DateTime.UtcNow).ToUnixTimeMilliseconds()) request.@params.homeWork.status = 200;
+                else  request.@params.homeWork.status = 100;
             }
 
             Homework homeWork = await _cosmos.SaveOrUpdate<Homework>(request.@params.homeWork);

+ 4 - 4
TEAMModelOS/Controllers/Task/SurveyController.cs

@@ -42,12 +42,12 @@ namespace TEAMModelOS.Controllers
             if (string.IsNullOrEmpty(request.@params.survey.id))
             {
                 request.@params.survey.id = Guid.NewGuid().ToString();
-                request.@params.survey.state = 100;
+                request.@params.survey.status = 100;
             }
             if (request.@params.survey.publishModel.Equals("0"))
             {
                 request.@params.survey.startTime = new DateTimeOffset(DateTime.UtcNow).ToUnixTimeMilliseconds();
-                request.@params.survey.state = 200;
+                request.@params.survey.status = 200;
             }
             else if (request.@params.survey.publishModel.Equals("1"))
             {
@@ -119,7 +119,7 @@ namespace TEAMModelOS.Controllers
 
             JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
             List<Survey> data = new List<Survey>();
-            List<string> props = new List<string> { "id", "code", "name", "type", "state", "startTime" };
+            List<string> props = new List<string> { "id", "code", "name", "type", "status", "startTime" };
             if (request.@params.Keys.Count > 0)
             { 
                 
@@ -194,7 +194,7 @@ namespace TEAMModelOS.Controllers
 
             foreach (Survey survey in surveys)
             {
-                survey.state = 100;
+                survey.status = 100;
             }
             List<Survey> survey1 = await azureCosmosDBV3Repository.UpdateAll<Survey>(surveys);
 

+ 3 - 3
TEAMModelOS/Controllers/Task/VoteController.cs

@@ -49,12 +49,12 @@ namespace TEAMModelOS.Controllers.Learn
             if (string.IsNullOrEmpty(request.@params.vote.id))
             {
                 request.@params.vote.id = Guid.NewGuid().ToString();
-                request.@params.vote.state = 100;
+                request.@params.vote.status = 100;
             }
             if (request.@params.vote.publishModel.Equals("0"))
             {
                 request.@params.vote.startTime = new DateTimeOffset(DateTime.UtcNow).ToUnixTimeMilliseconds();
-                request.@params.vote.state = 200;
+                request.@params.vote.status = 200;
             } else if (request.@params.vote.publishModel.Equals("1")) { 
             
                 _timerWorkService.TimerWork<Vote>(request.@params.vote.startTime,200, new Dictionary<string, object> { { "id", request.@params.vote.id } });
@@ -176,7 +176,7 @@ namespace TEAMModelOS.Controllers.Learn
 
             foreach (Vote vote in votes)
             {
-                vote.state = 100;
+                vote.status = 100;
             }
             List<Vote> vote1 = await _cosmos.UpdateAll<Vote>(votes);