页面修改

Edu.Module.User/StudentStatModule.cs

@@ -1629,7 +1629,7 @@ namespace Edu.Module.User
             List<RateYearItem> yearList = new List<RateYearItem>();
             List<RB_Student_Static_Extend> rateList = new List<RB_Student_Static_Extend>();
             var list = student_StaticRepository.GetStudentStaticYearListRepository(query);
-            if (list != null)
+            if (list != null && list.Count>0)
             {
                 int minYear = list.Min(qitem => qitem.YearStr);
                 int maxYear = list.Max(qitem => qitem.YearStr);
@@ -1838,11 +1838,11 @@ namespace Edu.Module.User
                 yearList.Add(new RateYearItem()
                 {
                     ItemName = "推送人数",
-                    FirstYearStr= minYear,
+                    FirstYearStr = minYear,
                     FirstYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == minYear).PushCount, 2),
-                    SecondYearStr=maxYear,
+                    SecondYearStr = maxYear,
                     SecondYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == maxYear).PushCount, 2),
-                    YearRate= Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).PushCount, 2),
+                    YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).PushCount, 2),
                 });
 
                 yearList.Add(new RateYearItem()
@@ -2145,7 +2145,6 @@ namespace Edu.Module.User
                     YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).StudyOrderMoney, 2),
                 });
             }
-
             return yearList;
         }
 
@@ -2158,6 +2157,8 @@ namespace Edu.Module.User
         {
             List<RateYearItem> yearList = new List<RateYearItem>();
             var dataList = student_StaticRepository.GetStudentStaticMonthListRepository(query, isYear:true);
+            if (dataList != null && dataList.Count > 0)
+            {
                 List<RB_Student_Static_Extend> result = new List<RB_Student_Static_Extend>();
                 int minYear = dataList.Min(qitem => qitem.YearStr);
                 int maxYear = dataList.Max(qitem => qitem.YearStr);
@@ -2331,7 +2332,7 @@ namespace Edu.Module.User
                         }
                         var newModel = new RB_Student_Static_Extend()
                         {
-                        YearStr =minYear+y,
+                            YearStr = minYear + y,
                             MonthStr = i + 1,
                             PushCount = PushCount,
                             NewCount = NewCount,
@@ -2369,7 +2370,7 @@ namespace Edu.Module.User
                     }
                 }
 
-            var lastPushCount = result.Where(qitem => qitem.YearStr == minYear).Average(qitem=>qitem.PushCount);
+                var lastPushCount = result.Where(qitem => qitem.YearStr == minYear).Average(qitem => qitem.PushCount);
                 var curPushCount = result.Where(qitem => qitem.YearStr == maxYear).Average(qitem => qitem.PushCount);
                 decimal CPushCount = 0;
                 if (lastPushCount > 0)
@@ -2896,6 +2897,7 @@ namespace Edu.Module.User
                     SecondYear = Math.Round(curStudyOrderMoney, 2),
                     YearRate = Math.Round(CStudyOrderMoney, 2),
                 });
+            }
             return yearList;
         }