Commit 9d67ccb2 authored by liudong1993's avatar liudong1993

1

parent 7a9e8275
...@@ -300,7 +300,7 @@ namespace Edu.Module.Finance ...@@ -300,7 +300,7 @@ namespace Edu.Module.Finance
/// </summary> /// </summary>
/// <param name="dmodel"></param> /// <param name="dmodel"></param>
/// <returns></returns> /// <returns></returns>
public decimal GetSellCommissionStatistics(RB_Activity_PeriodsDetail_ViewModel dmodel) public decimal GetActivityCommissionStatistics(RB_Activity_PeriodsDetail_ViewModel dmodel)
{ {
return activity_PeriodsDetailRepository.GetSellCommissionStatistics(dmodel); return activity_PeriodsDetailRepository.GetSellCommissionStatistics(dmodel);
} }
......
...@@ -209,7 +209,7 @@ from RB_Activity_PeriodsDetail r where {where} group by r.UserId,r.Depart_Id,r.S ...@@ -209,7 +209,7 @@ from RB_Activity_PeriodsDetail r where {where} group by r.UserId,r.Depart_Id,r.S
where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.DSUserName)} like '%{demodel.DSUserName}%'"; where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.DSUserName)} like '%{demodel.DSUserName}%'";
} }
string sql = $@" select sum(r.CommissionMoney) from RB_Sell_Commission_Details r where {where}"; string sql = $@" select sum(r.CommissionMoney) from RB_Activity_PeriodsDetail r where {where}";
var obj = ExecuteScalar(sql); var obj = ExecuteScalar(sql);
return obj == null ? 0 : Convert.ToDecimal(obj); return obj == null ? 0 : Convert.ToDecimal(obj);
} }
......
...@@ -249,7 +249,7 @@ namespace Edu.WebApi.Controllers.Finance ...@@ -249,7 +249,7 @@ namespace Edu.WebApi.Controllers.Finance
dmodel.Group_Id = userInfo.Group_Id; dmodel.Group_Id = userInfo.Group_Id;
var list = activityModule.GetActivityCommissionStatisticsPageList(pageModel.PageIndex, pageModel.PageSize, out long count, dmodel); var list = activityModule.GetActivityCommissionStatisticsPageList(pageModel.PageIndex, pageModel.PageSize, out long count, dmodel);
decimal TotalMoney = activityModule.GetSellCommissionStatistics(dmodel); decimal TotalMoney = activityModule.GetActivityCommissionStatistics(dmodel);
pageModel.Count = Convert.ToInt32(count); pageModel.Count = Convert.ToInt32(count);
pageModel.PageData = new pageModel.PageData = new
{ {
......
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