Merge branch 'master' of http://gitlab.oytour.com/viitto/eduspider

EduSpider.Model/Extend/ExamWorkResult.cs

@@ -54,6 +54,7 @@ namespace EduSpider.Model.Extend
         /// </summary>
         public string Title { get; set; }
 
+
         /// <summary>
         ///  评分机制(5-自定义，4-不评分，3-等第制，2-十分制，1-百分制)
         /// </summary>
@@ -126,5 +127,20 @@ namespace EduSpider.Model.Extend
         /// 考试领先度
         /// </summary>
         public decimal ExamRankRate { get; set; }
+
+        /// <summary>
+        /// 考试编号
+        /// </summary>
+        public int ExamId { get; set; }
+
+        /// <summary>
+        /// 考试详情编号
+        /// </summary>
+        public int ExamScoreId { get; set; }
+
+        /// <summary>
+        /// 教师姓名
+        /// </summary>
+        public string ThName { get; set; }
     }
 }

EduSpider.Repository/StuHomeWorkRepository.cs

@@ -78,6 +78,8 @@ WHERE 1=1
                         ScoreType = item.score_type,
                         Score_Value = item.Score_value,
                         HomeWorkStatus = item.status,
+                        ThName=item.th_name,
+
                     });
                     RowNum++;
                 }
@@ -97,7 +99,7 @@ WHERE 1=1
                     {
                         CreateTime = firstList.LastOrDefault().CreateTime.AddMinutes(1),
                         ResultType = 3,
-                        Title = "第一阶段评语",
+                        Title = firstList.LastOrDefault().ThName+ "老师的评语",
                         Comment = commentModel?.Info
                     };
 
@@ -111,7 +113,7 @@ WHERE 1=1
                     {
                         CreateTime = secondList.LastOrDefault().CreateTime.AddMinutes(1),
                         ResultType = 3,
-                        Title = "第二阶段评语",
+                        Title = secondList.LastOrDefault().ThName + "老师的评语",
                         Comment = commentModel?.Info
                     };
                 }
@@ -124,7 +126,7 @@ WHERE 1=1
                     {
                         CreateTime = thirdList.LastOrDefault().CreateTime.AddMinutes(1),
                         ResultType = 3,
-                        Title = "第三阶段评语",
+                        Title = thirdList.LastOrDefault().ThName + "老师的评语",
                         Comment = commentModel?.Info
                     };
                 }

EduSpider.Services/CourseService.cs

@@ -111,6 +111,8 @@ namespace EduSpider.Services
                         Score_p = score_p,
                         ExamRank = item.Rank,
                         ExamRankRate = item.RankRate,
+                        ExamId= item.ExamId,
+                        ExamScoreId=item.Id,
                     });
                 }
             }
@@ -118,6 +120,7 @@ namespace EduSpider.Services
             if (dataList != null && dataList.Count > 0)
             {
                 dataList = dataList.OrderBy(qitem => qitem.CreateTime).ToList();
+                var firstModel = dataList.FirstOrDefault();
                 foreach (var item in dataList)
                 {
                     object obj = new();
@@ -127,7 +130,7 @@ namespace EduSpider.Services
                         obj = new
                         {
                             item.Score,
-                            item.Score_p,
+                            Score_p = item.Score_p * 100,
                             item.ScoreType,
                             item.ScoreTypeStr,
                             item.Score_Value,
@@ -141,9 +144,11 @@ namespace EduSpider.Services
                         obj = new
                         {
                             item.Score,
-                            item.Score_p,
+                            Score_p = item.Score_p * 100,
                             item.ExamRank,
                             item.ExamRankRate,
+                            item.ExamId,
+                            item.ExamScoreId,
                         };
                     }
                     //评语
@@ -154,15 +159,22 @@ namespace EduSpider.Services
                             item.Comment
                         };
                     }
-
+                    string subTitle = "";
+                    if (item.CreateTime.Year != firstModel.CreateTime.Year)
+                    {
+                        subTitle = firstModel.CreateTime.Year.ToString();
+                    }
+                    string createTime = Convert.ToDateTime(item.CreateTime.ToString()).ToString("MM-dd HH:mm");
                     list.Add(new
                     {
                         item.ResultType,
                         item.ResultTypeStr,
                         item.Title,
-                        CreateTime = VTX.FW.Helper.ConvertHelper.FormatTime(item.CreateTime, 2),
+                        TimeTile=subTitle,
+                        CreateTime = createTime,
                         DataObj = obj
                     });
+                    firstModel = item;
                 }
             }
             return list;