1

Edu.Module.Course/SellAchievementsModule.cs

@@ -385,7 +385,14 @@ namespace Edu.Module.Course
                     item.SchoolName = slist.Where(x => x.SId == item.School_Id).FirstOrDefault()?.SName ?? "";
                     item.ClassName = clist.Where(x => x.ClassId == item.ClassId).FirstOrDefault()?.ClassName ?? "";
                     item.ClassNo = clist.Where(x => x.ClassId == item.ClassId).FirstOrDefault()?.ClassNo ?? "";
-                    item.ClassTypeName = ctlist.Where(x => x.CTypeId == item.ClassType).FirstOrDefault()?.CTypeName ?? "";
+                    if (item.ClassType == -1)
+                    {
+                        item.ClassTypeName = "留学";
+                    }
+                    else
+                    {
+                        item.ClassTypeName = ctlist.Where(x => x.CTypeId == item.ClassType).FirstOrDefault()?.CTypeName ?? "";
+                    }
                 }
             }
             return list;
@@ -423,7 +430,14 @@ namespace Edu.Module.Course
                     item.SchoolName = slist.Where(x => x.SId == item.School_Id).FirstOrDefault()?.SName ?? "";
                     item.ClassName = clist.Where(x => x.ClassId == item.ClassId).FirstOrDefault()?.ClassName ?? "";
                     item.ClassNo = clist.Where(x => x.ClassId == item.ClassId).FirstOrDefault()?.ClassNo ?? "";
-                    item.ClassTypeName = ctlist.Where(x => x.CTypeId == item.ClassType).FirstOrDefault()?.CTypeName ?? "";
+                    if (item.ClassType == -1)
+                    {
+                        item.ClassTypeName = "留学";
+                    }
+                    else
+                    {
+                        item.ClassTypeName = ctlist.Where(x => x.CTypeId == item.ClassType).FirstOrDefault()?.CTypeName ?? "";
+                    }
                 }
             }
             return list;
@@ -461,7 +475,14 @@ namespace Edu.Module.Course
                     item.SchoolName = slist.Where(x => x.SId == item.School_Id).FirstOrDefault()?.SName ?? "";
                     item.ClassName = clist.Where(x => x.ClassId == item.ClassId).FirstOrDefault()?.ClassName ?? "";
                     item.ClassNo = clist.Where(x => x.ClassId == item.ClassId).FirstOrDefault()?.ClassNo ?? "";
-                    item.ClassTypeName = ctlist.Where(x => x.CTypeId == item.ClassType).FirstOrDefault()?.CTypeName ?? "";
+                    if (item.ClassType == -1)
+                    {
+                        item.ClassTypeName = "留学";
+                    }
+                    else
+                    {
+                        item.ClassTypeName = ctlist.Where(x => x.CTypeId == item.ClassType).FirstOrDefault()?.CTypeName ?? "";
+                    }
                 }
             }
             return list;
@@ -1072,10 +1093,12 @@ namespace Edu.Module.Course
                                 ClassType = 1,
                                 OpenTime = Convert.ToDateTime(month + "-01")
                             };
-                            if (item.OrderType == Common.Enum.Sale.OrderTypeEnum.StudyabroadOrder) {
-                                classModel.ClassType = 3;//留学
+                            if (item.OrderType == Common.Enum.Sale.OrderTypeEnum.StudyabroadOrder)
+                            {
+                                classModel.ClassType = -1;//留学
                             }
                         }
+                        if (classModel.ClassType == 0) { classModel.ClassType = 1; }
                         //当前已发提成
                         decimal SaleCommissioned = dlist.Where(x => x.OrderId == item.OrderId && x.UserId == AchModel.EmpId && x.UserType == AchModel.Type && x.IsDept == AchModel.IsDept).Sum(x => x.CurrentPeriodMoney);