Commit a711068f authored by 黄奎's avatar 黄奎

页面修改

parent 21567372
......@@ -59,6 +59,11 @@ namespace Edu.Model.ViewModel.Customer
}
/// <summary>
/// 审核状态
/// </summary>
public int QApproveState { get; set; }
/// <summary>
/// 审核人
/// </summary>
......
......@@ -44,9 +44,9 @@ namespace Edu.Module.Course
/// </summary>
public void CreateEmployeeBonusModule(int GroupId)
{
string endDate = "2021-11-30";
string endDate = "2021-12-31";
int CurrentYear = 2021;
int CurrentMonth = 11;
int CurrentMonth = 12;
//人头配置列表
var planList= bonus_PlanRepository.GetBounsPlanListRepository(new RB_Bonus_PlanExtend() {
Group_Id=GroupId
......@@ -72,13 +72,21 @@ namespace Edu.Module.Course
CurGuestNum= curNum,
CurOrderMoney= curOrderMoney,
Group_Id =GroupId,
CurRewardMoney= GetStepAwardAmount(item, curNum)
CurRewardMoney= GetStepAwardAmount(item, curNum),
CreateBy=0,
CreateTime=DateTime.Now,
UpdateBy=1,
UpdateTime=DateTime.Now,
};
var newId = personnel_BonusRepository.Insert(pModel);
pModel.Id = newId;
foreach (var oItem in orderList)
{
var detail = new RB_Personnel_BonusDetail()
{
Id = 0,
BonusId = pModel.Id
};
}
}
}
......
......@@ -61,6 +61,17 @@ WHERE 1=1
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Customer_Extend.ApproveState), query.ApproveState);
}
if (query.QApproveState > 0)
{
if (query.QApproveState == 3)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Customer_Extend.ApproveState), 0);
}
else
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Customer_Extend.ApproveState), query.QApproveState);
}
}
if (query.QCustomerState > 0)
{
switch (query.QCustomerState)
......
......@@ -1186,7 +1186,7 @@ WHERE 1=1
");
builder.AppendFormat(" AND o.OrderState IN({0},{1}) ", (int)OrderStateEnum.Normal, (int)OrderStateEnum.DropOut);
builder.AppendFormat(" AND o.{0}={1} ", nameof(RB_Order_ViewModel.OrderType), (int)OrderTypeEnum.CourseOrder);
//builder.AppendFormat(" AND o.CreateTime >= '2021-12-01' ");
builder.AppendFormat(" AND o.CreateTime >= '2021-12-01' ");
//帐平
builder.AppendFormat(" AND o.PreferPrice = (o.Income - o.Refund + o.DiscountMoney + o.PlatformTax) ");
if (group_Id > 0)
......
......@@ -54,6 +54,7 @@ namespace Edu.WebApi.Controllers.Customer
ContactNumber = base.ParmJObj.GetStringValue("ContactNumber"),
ApproveState = base.ParmJObj.GetInt("ApproveState"),
QCustomerState = base.ParmJObj.GetInt("QCustomerState"),
QApproveState=base.ParmJObj.GetInt("QApproveState")
};
var list = customerModule.GetCustomerPageModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
foreach (var item in list)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment