Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

Edu.Common/Enum/Course/GuestEducationEnum.cs

@@ -49,11 +49,11 @@ namespace Edu.Common.Enum.Course
         /// 博士
         /// </summary>
         [EnumField("博士")]
-        N8 = 7,
+        N8 = 8,
         /// <summary>
         /// 博士后
         /// </summary>
         [EnumField("博士后")]
-        N9 = 7,
+        N9 = 9,
     }
 }

Edu.EducationCore/Helper/QuarzHelper.cs

@@ -75,6 +75,7 @@ namespace Edu.Education.Helper
                     {
                         try
                         {
+                            LogHelper.Write("ClassId：" + qitem.ClassId);
                             string msg = teachingRewardsModule.SetTeachingPerfCreate(0, qitem);
                             if (msg != null)
                             {

Edu.Module.Course/OrderModule.cs

@@ -935,7 +935,7 @@ namespace Edu.Module.Course
         /// </summary>
         /// <param name="dmodel"></param>
         /// <returns></returns>
-        public bool SetOrderGuestInfo(RB_Order_Guest_ViewModel dmodel)
+        public string SetOrderGuestInfo(RB_Order_Guest_ViewModel dmodel)
         {
             if (dmodel.Id > 0)
             {
@@ -1013,16 +1013,16 @@ namespace Edu.Module.Course
                         SourceId = gModel.OrderId
                     });
                 }
-                return flag;
+                return flag ? "" : "出错了，请联系管理员";
             }
             else {
                 var ordermodel = orderRepository.GetEntity(dmodel.OrderId);
-                if (ordermodel == null) { return false; }
+                if (ordermodel == null) { return "订单不存在"; }
                 dmodel.ClassId = ordermodel.ClassId;
                 int GuestNum = order_GuestRepository.GetGuestNum(new RB_Order_Guest_ViewModel() { OrderId = dmodel.OrderId, GuestState = 1 });
                 if (GuestNum >= ordermodel.GuestNum)
                 {
-                    return false;
+                    return "学生名单已录入完毕";
                 }
                 int Id = order_GuestRepository.Insert(dmodel);
                 bool flag = Id > 0;
@@ -1113,7 +1113,7 @@ namespace Edu.Module.Course
                         SourceId = dmodel.OrderId
                     });
                 }
-                return flag;
+                return flag ? "" : "出错了，请联系管理员";
             }
         }
 

Edu.Module.Course/TeachingRewardsModule.cs

@@ -1173,7 +1173,7 @@ namespace Edu.Module.Course
                     Number = tmodel.ClassHours,
                     OriginalMoney = tmodel.UnitPrice,
                     tmodel.UnitPrice,
-                    Remark = "满班率：" + tmodel.FullClassRate + "，平均上课率：" + tmodel.AvgCheckRate + "，累计课时：" + tmodel.ClassHours
+                    Remark = "满班率：" + tmodel.FullClassRate + "%，平均上课率：" + tmodel.AvgCheckRate + "%，累计课时：" + tmodel.ClassHours
                 }
             };
             var classModel = classRepository.GetEntity(tmodel.ClassId);

Edu.WebApi/Controllers/Course/OrderController.cs

@@ -762,13 +762,13 @@ namespace Edu.WebApi.Controllers.Course
             dmodel.CreateTime = DateTime.Now;
             dmodel.UpdateBy = userInfo.Id;
             dmodel.UpdateTime = DateTime.Now;
-            bool flag = orderModule.SetOrderGuestInfo(dmodel);
-            if (flag)
+            string msg = orderModule.SetOrderGuestInfo(dmodel);
+            if (msg == "")
             {
                 return ApiResult.Success();
             }
             else {
-                return ApiResult.Failed();
+                return ApiResult.Failed(msg);
             }
         }
 

Edu.WebApi/Controllers/Course/TeachingRewardsController.cs

@@ -88,12 +88,12 @@ namespace Edu.WebApi.Controllers.Course
             {
                 return ApiResult.ParamIsNull("请传递比例列表");
             }
-            decimal xcrate = 0;
+            decimal xcrate = -1;
             foreach (var item in deList) {
-                if (item.StartValue <= 0) {
+                if (item.StartValue < 0) {
                     return ApiResult.ParamIsNull("比率不能小于0");
                 }
-                if (item.EndValue <= 0) {
+                if (item.EndValue < 0) {
                     return ApiResult.ParamIsNull("比率不能小于0");
                 }
                 if (item.StartValue > item.EndValue) {
@@ -108,13 +108,13 @@ namespace Edu.WebApi.Controllers.Course
                 {
                     return ApiResult.ParamIsNull("请传递满班率列表");
                 }
-                decimal mbrate = 0;
+                decimal mbrate = -1;
                 foreach (var qitem in deList) {
-                    if (qitem.StartValue <= 0)
+                    if (qitem.StartValue < 0)
                     {
                         return ApiResult.ParamIsNull("比率不能小于0");
                     }
-                    if (qitem.EndValue <= 0)
+                    if (qitem.EndValue < 0)
                     {
                         return ApiResult.ParamIsNull("比率不能小于0");
                     }
@@ -208,6 +208,10 @@ namespace Edu.WebApi.Controllers.Course
             var pageModel = JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
             var dmodel = JsonHelper.DeserializeObject<RB_Teaching_Bonus_ViewModel>(RequestParm.Msg.ToString());
             dmodel.Group_Id = userInfo.Group_Id;
+            if (!string.IsNullOrEmpty(dmodel.Month))
+            {
+                dmodel.Month = Convert.ToDateTime(dmodel.Month).ToString("yyyy-MM");
+            }
 
             var list = teachingRewardsModule.GetTeachingBonusPageList(pageModel.PageIndex, pageModel.PageSize, out long count, dmodel);
             pageModel.Count = Convert.ToInt32(count);
@@ -553,11 +557,11 @@ namespace Edu.WebApi.Controllers.Course
                 x.UpdateBy,
                 UpdateByName = UserReidsCache.GetUserLoginInfo(x.UpdateBy)?.AccountName ?? "",
                 UpdateTime = x.UpdateTime.ToString("yyyy-MM-dd HH:mm:ss"),
-                JJList = x.JJList.Select(z=>new { 
+                JJList = x.JJList.OrderBy(z => z.StartValue).Select(z=>new { 
                     z.Id,
                     z.StartValue,
                     z.EndValue,
-                    FullClassList = z.FullClassList.Select(y=>new { 
+                    FullClassList = z.FullClassList.OrderBy(y => y.StartValue).Select(y=>new { 
                         y.Id,
                         y.StartValue,
                         y.EndValue,
@@ -570,11 +574,11 @@ namespace Edu.WebApi.Controllers.Course
                     y.StartValue,
                     y.EndValue
                 }),
-                KSList = x.KSList.Select(z => new {
+                KSList = x.KSList.OrderBy(z => z.StartValue).Select(z => new {
                     z.Id,
                     z.StartValue,
                     z.EndValue,
-                    FullClassList = z.FullClassList.Select(y => new {
+                    FullClassList = z.FullClassList.OrderBy(y => y.StartValue).Select(y => new {
                         y.Id,
                         y.StartValue,
                         y.EndValue,
@@ -601,7 +605,7 @@ namespace Edu.WebApi.Controllers.Course
         {
             if (list.Any())
             {
-                return list.FirstOrDefault().FullClassList;
+                return list.FirstOrDefault().FullClassList.OrderBy(x => x.StartValue).ToList();
             }
             return new List<RB_Teaching_Rewards_Rate_ViewModel>();
         }