页面修改

EduSpider.Repository/StuHomeWorkRepository.cs

@@ -134,9 +134,9 @@ WHERE 1=1
                             if (homeWorkList.Count >= 5)
                             {
                                 var firstList = homeWorkList.Where(qitem => qitem.RowNum <= 5).ToList();
-                                var firstFlag = firstList.Where(qitem => qitem.HomeWorkStatus == 0).Any();
-                                //第一阶段有未提交的作业就不生成系统评价
-                                if (!firstFlag)
+                                var firstSubmitCount = firstList.Where(qitem => qitem.HomeWorkStatus == 0).Count();
+                                //第一阶段有提交作业情况(至少一次)
+                                if (firstList.Count!= firstSubmitCount)
                                 {
                                     var firstScore = firstList.Average(qitem => qitem.Score_p) * 100;
                                     string title = firstList.LastOrDefault().ThName + "老师的评语";
@@ -167,8 +167,9 @@ WHERE 1=1
                             if (homeWorkList.Count >= 9)
                             {
                                 var secondList = homeWorkList.Where(qitem => qitem.RowNum > 5 && qitem.RowNum <= 9).ToList();
-                                var secondFlag = secondList.Where(qitem => qitem.HomeWorkStatus == 0).Any();
-                                if (!secondFlag)
+                                var secondSubmitCount = secondList.Where(qitem => qitem.HomeWorkStatus == 0).Count();
+                                //第二阶段有提交作业情况(至少一次)
+                                if (secondList.Count()!= secondSubmitCount)
                                 {
                                     var secondScore = secondList.Average(qitem => qitem.Score_p) * 100;
                                     info = GetCommentInfo(courseCommentModel, secondScore);
@@ -197,8 +198,9 @@ WHERE 1=1
                             if (homeWorkList.Count >= 13)
                             {
                                 var thirdList = homeWorkList.Where(qitem => qitem.RowNum > 9 && qitem.RowNum <= 13).ToList();
-                                var thirdFlag = thirdList.Where(qitem => qitem.HomeWorkStatus == 0).Any();
-                                if (!thirdFlag)
+                                var thirdSubmitCount = thirdList.Where(qitem => qitem.HomeWorkStatus == 0).Count();
+                                //第三阶段有提交作业情况(至少一次)
+                                if (thirdList.Count!= thirdSubmitCount)
                                 {
                                     var thirdScore = thirdList.Average(qitem => qitem.Score_p) * 100;
                                     info = GetCommentInfo(courseCommentModel, thirdScore);

EduSpider.Services/CourseService.cs

@@ -109,7 +109,24 @@ namespace EduSpider.Services
             var homeWorkList = StuHomeWorkRepository.GetStuHomeWorkListRepository(query);
             if (homeWorkList != null && homeWorkList.Count > 0)
             {
-                dataList.AddRange(homeWorkList);
+                foreach (var item in homeWorkList)
+                {
+                    dataList.Add(new ExamWorkResult()
+                    {
+                        RowNum=item.RowNum,
+                        Stu_HomeWork_Id = item.Stu_HomeWork_Id,
+                        CreateTime = item.CreateTime,
+                        ResultType = item.ResultType,
+                        Comment = item.Comment,
+                        Title = item.Title,
+                        ScoreType = item.ScoreType,
+                        Score_Value = item.Score_Value,
+                        Score = item.Score,
+                        Score_p = item.Score_p,
+                        HomeWorkStatus = item.HomeWorkStatus,
+                        ThName = item.ThName,
+                    });
+                }
             }
             var examList = Exam_ScoreRepository.GetExamScoreListRepository(query);
             if (examList != null && examList.Count > 0)