Commit d9d7956a authored by 黄奎's avatar 黄奎

页面修改

parent 837431ab
...@@ -48,5 +48,25 @@ namespace Edu.Model.ViewModel.Course ...@@ -48,5 +48,25 @@ namespace Edu.Model.ViewModel.Course
return str; return str;
} }
} }
/// <summary>
/// 学员生日字符串
/// </summary>
public string StuBirthStr { get { return Common.ConvertHelper.FormatDate(this.StuBirth); } }
/// <summary>
/// 第一期-支付日期字符串
/// </summary>
public string FirstPayDateStr { get { return Common.ConvertHelper.FormatDate(this.FirstPayDate); } }
/// <summary>
/// 第二期-支付日期字符串
/// </summary>
public string SecondPayDateStr { get { return Common.ConvertHelper.FormatDate(this.SecondPayDate); } }
/// <summary>
/// 第三期-支付日期字符串
/// </summary>
public string ThirdPayDateStr { get { return Common.ConvertHelper.FormatDate(this.ThirdPayDate); } }
} }
} }
...@@ -37,7 +37,7 @@ namespace Edu.WebApi.Controllers.Course ...@@ -37,7 +37,7 @@ namespace Edu.WebApi.Controllers.Course
{ {
int OrderId = base.ParmJObj.GetInt("OrderId", 0);//订单编号 int OrderId = base.ParmJObj.GetInt("OrderId", 0);//订单编号
int GuestId = base.ParmJObj.GetInt("GuestId", 0);//学员编号 int GuestId = base.ParmJObj.GetInt("GuestId", 0);//学员编号
var model = educationContractModule.GetStudentInfoModule(OrderId,GuestId); var model = educationContractModule.GetStudentInfoModule(OrderId, GuestId);
return ApiResult.Success("", model); return ApiResult.Success("", model);
} }
...@@ -54,9 +54,9 @@ namespace Edu.WebApi.Controllers.Course ...@@ -54,9 +54,9 @@ namespace Edu.WebApi.Controllers.Course
{ {
OrderId = base.ParmJObj.GetInt("OrderId"), OrderId = base.ParmJObj.GetInt("OrderId"),
ContractNo = base.ParmJObj.GetStringValue("ContractNo"), ContractNo = base.ParmJObj.GetStringValue("ContractNo"),
CType=(ContractTypeEnum)base.ParmJObj.GetInt("CType"), CType = (ContractTypeEnum)base.ParmJObj.GetInt("CType"),
Status=base.ParmJObj.GetInt("Status"), Status = base.ParmJObj.GetInt("Status"),
StudentName=base.ParmJObj.GetStringValue("StudentName"), StudentName = base.ParmJObj.GetStringValue("StudentName"),
}; };
dmodel.Group_Id = userInfo.Group_Id; dmodel.Group_Id = userInfo.Group_Id;
var list = educationContractModule.GetEducationContractPageListModule(pageModel.PageIndex, pageModel.PageSize, out long count, dmodel); var list = educationContractModule.GetEducationContractPageListModule(pageModel.PageIndex, pageModel.PageSize, out long count, dmodel);
...@@ -65,7 +65,9 @@ namespace Edu.WebApi.Controllers.Course ...@@ -65,7 +65,9 @@ namespace Edu.WebApi.Controllers.Course
{ {
x.Id, x.Id,
x.CType, x.CType,
CTypeName = x.CType.ToName(),
x.OrderId, x.OrderId,
x.GuestId,
x.ContractNo, x.ContractNo,
x.StudentName, x.StudentName,
x.SchoolName, x.SchoolName,
...@@ -157,12 +159,12 @@ namespace Edu.WebApi.Controllers.Course ...@@ -157,12 +159,12 @@ namespace Edu.WebApi.Controllers.Course
ThirdBookFee = base.ParmJObj.GetDecimal("ThirdBookFee"), ThirdBookFee = base.ParmJObj.GetDecimal("ThirdBookFee"),
ThirdClassFee = base.ParmJObj.GetDecimal("ThirdClassFee"), ThirdClassFee = base.ParmJObj.GetDecimal("ThirdClassFee"),
ThirdDiscountMoney = base.ParmJObj.GetDecimal("ThirdDiscountMoney"), ThirdDiscountMoney = base.ParmJObj.GetDecimal("ThirdDiscountMoney"),
ThirdMoney=base.ParmJObj.GetDecimal("ThirdMoney"), ThirdMoney = base.ParmJObj.GetDecimal("ThirdMoney"),
ThirdPayDate=base.ParmJObj.GetDateTime("ThirdPayDate"), ThirdPayDate = base.ParmJObj.GetDateTime("ThirdPayDate"),
CNYCaps=base.ParmJObj.GetStringValue("CNYCaps"), CNYCaps = base.ParmJObj.GetStringValue("CNYCaps"),
Money=base.ParmJObj.GetDecimal("Money"), Money = base.ParmJObj.GetDecimal("Money"),
Exam=base.ParmJObj.GetStringValue("Exam"), Exam = base.ParmJObj.GetStringValue("Exam"),
IsSupplement=base.ParmJObj.GetInt("IsSupplement"), IsSupplement = base.ParmJObj.GetInt("IsSupplement"),
}; };
dmodel.Group_Id = userInfo.Group_Id; dmodel.Group_Id = userInfo.Group_Id;
dmodel.CreateBy = userInfo.Id; dmodel.CreateBy = userInfo.Id;
......
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