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

Edu.Model/Entity/Sell/RB_Bonus_Plan.cs

@@ -97,5 +97,10 @@ namespace Edu.Model.Entity.Sell
 		/// 删除状态
 		/// </summary>
 		public DateStateEnum Status { get; set; }
+
+		/// <summary>
+		/// 月度达标金额
+		/// </summary>
+		public decimal MonthGoalMoney { get; set; }
 	}
 }

Edu.Module.Course/BonusConfigModule.cs

@@ -162,6 +162,7 @@ namespace Edu.Module.Course
                     {nameof(RB_Bonus_PlanExtend.UpdateBy),model.UpdateBy },
                     {nameof(RB_Bonus_PlanExtend.UpdateTime),model.UpdateTime },
                     {nameof(RB_Bonus_PlanExtend.School_Id),model.School_Id },
+                    {nameof(RB_Bonus_PlanExtend.MonthGoalMoney),model.MonthGoalMoney },
                 };
                 flag = bonus_PlanRepository.Update(fileds, new WhereHelper(nameof(RB_Bonus_PlanExtend.Id), model.Id));
             }
@@ -251,7 +252,8 @@ namespace Edu.Module.Course
                 extModel?.UseCourseIds,
                 UseCourseIdList = Common.ConvertHelper.StringToList(extModel?.UseCourseIds),
                 NotUseCourseIdList = Common.ConvertHelper.StringToList(extModel?.NotUseCourseIds),
-                DetailList = extModel?.DetailList ?? new List<RB_Bouns_PlanDetail_Extend>()
+                DetailList = extModel?.DetailList ?? new List<RB_Bouns_PlanDetail_Extend>(),
+                extModel?.MonthGoalMoney,
             };
             return obj;
         }

Edu.Repository/Sell/RB_Bonus_PlanRepository.cs

@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using System.Linq;
+using VT.FW.DB.Dapper;
 
 namespace Edu.Repository.Sell
 {
@@ -23,6 +24,7 @@ namespace Edu.Repository.Sell
         /// <returns></returns>
         public List<RB_Bonus_PlanExtend> GetBounsPlanPageRepository(int pageIndex,int pageSize,out long rowsCount,RB_Bonus_PlanExtend query)
         {
+            var parameters = new DynamicParameters();
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@"
 SELECT A.*
@@ -40,6 +42,11 @@ WHERE 1=1
                 {
                     builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_Bonus_PlanExtend.PlanType), query.PlanType);
                 }
+                if (!string.IsNullOrEmpty(query.PlanName))
+                {
+                    builder.AppendFormat(" AND A.{0} LIKE @PlanName ", nameof(RB_Bonus_PlanExtend.PlanName));
+                    parameters.Add("PlanName", "%" + query.PlanName.Trim() + "%");
+                }
             }
             return GetPage<RB_Bonus_PlanExtend>(pageIndex,pageSize,out rowsCount,builder.ToString()).ToList();
         }

Edu.WebApi/Controllers/Bonus/BonusController.cs

@@ -63,6 +63,7 @@ namespace Edu.WebApi.Controllers.Bonus
                     item.SaleList,
                     item.UseCourseList,
                     item.NotUseCourseList,
+                    item.MonthGoalMoney,
                 });
             }
             pageModel.Count = rowsCount;
@@ -89,6 +90,7 @@ namespace Edu.WebApi.Controllers.Bonus
                 SaleIds = base.ParmJObj.GetStringValue("SaleIds"),
                 UseCourseIds = base.ParmJObj.GetStringValue("UseCourseIds"),
                 NotUseCourseIds = base.ParmJObj.GetStringValue("NotUseCourseIds"),
+                MonthGoalMoney=base.ParmJObj.GetDecimal("MonthGoalMoney"),
             };
             query.CreateBy = base.UserInfo.Id;
             query.UpdateBy = base.UserInfo.Id;

Edu.WebApi/Controllers/Course/EducationContractController.cs

@@ -326,6 +326,8 @@ namespace Edu.WebApi.Controllers.Course
             {
                 return ApiResult.ParamIsNull("请传递合同id");
             }
+            //直接审批通过 (HK2021-12-21修改)
+            State = 2;
             bool flag = educationContractModule.SetEducationContractAuditModule(ContractId, State, userInfo);
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }