Commit 5befc369 authored by liudong1993's avatar liudong1993

1

parent 9af20fb5
...@@ -106,5 +106,15 @@ namespace Edu.Model.Entity.Course ...@@ -106,5 +106,15 @@ namespace Edu.Model.Entity.Course
/// 状态 /// 状态
/// </summary> /// </summary>
public DateStateEnum Status { get; set; } public DateStateEnum Status { get; set; }
/// <summary>
/// 教育返佣类型(0-百分比,1-固定金额)
/// </summary>
public int EduCommissionType { get; set; }
/// <summary>
/// 教育同行佣金
/// </summary>
public decimal EduCommissionMoney { get; set; }
} }
} }
...@@ -108,5 +108,15 @@ namespace Edu.Model.Entity.StudyAbroad ...@@ -108,5 +108,15 @@ namespace Edu.Model.Entity.StudyAbroad
/// 状态 /// 状态
/// </summary> /// </summary>
public DateStateEnum Status { get; set; } public DateStateEnum Status { get; set; }
/// <summary>
/// 教育返佣类型(0-百分比,1-固定金额)
/// </summary>
public int EduCommissionType { get; set; }
/// <summary>
/// 教育同行佣金
/// </summary>
public decimal EduCommissionMoney { get; set; }
} }
} }
...@@ -1040,15 +1040,7 @@ namespace Edu.Module.Finance ...@@ -1040,15 +1040,7 @@ namespace Edu.Module.Finance
public List<RB_SimpleReport_Extend> GetEasyReportList(RB_SimpleReport_Extend model) public List<RB_SimpleReport_Extend> GetEasyReportList(RB_SimpleReport_Extend model)
{ {
var list = edu_simpleReportRepository.GetList(model); var list = edu_simpleReportRepository.GetList(model);
var clist = new List<RB_Costtype_Extend>(); var clist = costtypeRepository.GetList(new RB_Costtype_Extend() { RB_Group_Id = model.Rb_Group_Id });
if (model.Year > 2021)
{
clist = costtypeRepository.GetList(new RB_Costtype_Extend() { RB_Group_Id = model.Rb_Group_Id });
}
else
{
clist = costtypeRepository.GetList(new RB_Costtype_Extend() { });
}
foreach (var item in list) foreach (var item in list)
{ {
if (item.Abstract == "工资") if (item.Abstract == "工资")
......
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