页面修改

Edu.Module.Course/ClassModule.cs

@@ -1485,7 +1485,7 @@ namespace Edu.Module.Course
                     }
                     list.Add(new
                     {
-                        IsEndDate = item.ClassDate <= today,
+                        IsEndDate = item.ClassDate <= today&&item.ClassDate>=today.AddDays(-7),
                         item.ClassPlanId,
                         item.ClassId,
                         item.ClassDate,

Edu.Module.Exam/PaperModule.cs

@@ -1253,8 +1253,7 @@ namespace Edu.Module.Exam
                             var stuTempList = studentDetailsList.Where(qitem => qitem.StuPaperGroupId == gItem.GId);
                             foreach (var sItem in stuTempList)
                             {
-                                var questionModel = gItem.DetailsList.Where(qitem => qitem.Id == sItem.DetailsId)?.FirstOrDefault();
-
+                                var questionModel = gItem?.DetailsList.Where(qitem => qitem.Id == sItem.DetailsId)?.FirstOrDefault();
                                 var QuestionContentObj = new object();
                                 if (isShowAnswer)
                                 {
@@ -1290,8 +1289,12 @@ namespace Edu.Module.Exam
                                     }
                                 }
                                 else if (questionModel.QuestionTypeKey == "reading-comprehensio" || questionModel.QuestionTypeKey == "listening")
-                                { 
-                                    
+                                {
+                                    var qList= JsonHelper.DeserializeObject<List<matchingItem>>(sItem.StundetAnswer.ToString());
+                                    foreach (var mItem in qList)
+                                    {
+                                        answerList.Add(new { mItem.Name, mItem.Content });
+                                    }
                                 }
 
                                 var qObj = new
@@ -1309,8 +1312,8 @@ namespace Edu.Module.Exam
                                     Answer = isShowAnswer ? questionModel.Answer : sItem.StundetAnswer,
                                     sItem.StundetAnswer,
                                     AnswerList = isShowAnswer ? answerList : new List<object> (),
-                                    AnswerParse = questionModel.AnswerParse,
-                                    StundetScore = sItem.StundetScore,
+                                    questionModel.AnswerParse,
+                                    sItem.StundetScore,
                                     sItem.IsMarking
                                 };
                                 questionList.Add(qObj);

Edu.WebApi/Controllers/Course/ClassController.cs

@@ -2231,7 +2231,7 @@ namespace Edu.WebApi.Controllers.Course
                 {
                     var path = $"/course/prepareclassDetails?ClassId={query.ClassId}&ClassPlanId={query.ClassPlanId}";
                     path=HttpUtility.UrlEncode(path);
-                    string markdownContent = $"`教师备课` 主管评论备课内容通知\n>**概要信息** \n>上课日期：<font color='info'>{query.ClassDate.Value.ToString("yyyy-MM-dd")}</font>\n>评价人：<font color='warning'>{model.CreateByName}</font>\n>评价日期：<font color='comment'>{DateTime.Now.ToString("MM-dd HH:mm")}</font>\n>\n>分数：<font color='comment'>{(query.Score == -1 ? "未评分" : query.Score + "分")}</font>\n>请点击：[查看详情]({Config.ErpUrl}/autologin?loginId={query.TeacherId}&target={path}#target=out)";
+                    string markdownContent = $"`教师备课` 主管评论备课内容通知\n>**概要信息** \n>上课日期：<font color='info'>{query.ClassDate.Value:yyyy-MM-dd}</font>\n>评价人：<font color='warning'>{model.CreateByName}</font>\n>评价日期：<font color='comment'>{DateTime.Now:MM-dd HH:mm}</font>\n>\n>分数：<font color='comment'>{(query.Score == -1 ? "未评分" : query.Score + "分")}</font>\n>请点击：[查看详情]({Config.ErpUrl}/autologin?loginId={query.TeacherId}&target={path}#target=out)";
                     Common.Message.PushMessageModel modelWork = new Common.Message.PushMessageModel()
                     {
                         CategoryId = PushMessageCategoryEnum.LessonComment,