Skip to content

E
Education
Commit 4f4ffe96 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 3ac7b027
Hide whitespace changes
Inline Side-by-side
Showing with 92 additions and 16 deletions
Edu.Common/Plugin/ConvertHelper.cs
View file @ 4f4ffe96
......@@ -94,7 +94,7 @@ namespace Edu.Common
}
/// <summary>
/// 获取时间格式
/// 获取时间格式[MM-dd]
/// </summary>
/// <param name="time"></param>
/// <returns></returns>
......
Edu.Module.Course/EmployeeBonusModule.cs
View file @ 4f4ffe96
......@@ -608,16 +608,31 @@ namespace Edu.Module.Course
}
else
{
DateTime d1 = new DateTime(Year, Month, 1);
string startDate = Common.ConvertHelper.FormatDate(d1);
DateTime endTime = d1.AddMonths(1).AddDays(-1);
string endDate = Common.ConvertHelper.FormatDate(endTime);
var list = personnel_BonusRepository.GetPersonnelBonusListRepository(new RB_Personnel_Bonus_Extend()
{
EmployeeId = user.Id,
YearNum = Year,
MonthNum = Month
}, isGetDetail: true);
monthData.BonusMoney = list?.Sum(qitem => qitem.CurRewardMoney + qitem.ClueNumSalary + qitem.OpenBonus - qitem.BeforeMoney) ?? 0;
monthData.TotalBonusMoney = list?.Sum(qitem => qitem.CurRewardMoney + qitem.ClueNumSalary + qitem.OpenBonus) ?? 0;
monthData.CurRewardMoney = list?.Sum(qitem => qitem.CurRewardMoney) ?? 0;
monthData.OpenBonus = list?.Sum(qitem => qitem.OpenBonus) ?? 0;
monthData.ClueNumSalary = list?.Sum(qitem => qitem.ClueNumSalary) ?? 0;
monthData.GuestNum = list?.Sum(qitem => qitem.CurGuestNum) ?? 0;
monthData.OrderCount = list?.Sum(qitem => qitem?.DeductionList?.Count) ?? 0;
monthData.ReachCount = list?.FirstOrDefault()?.IsReach ?? 0;
monthData.OrderCount = 0;
//线索奖励
var stuModel = studentRepository.GetStudentStaticRepository(user.Id.ToString(), startDate, endDate)?.FirstOrDefault();
monthData.ClueCount = stuModel?.ClueCount ?? 0;
foreach (var subItem in list)
{
monthData.OrderCount += subItem?.DetailList?.Count()??0;
}
monthData.ReachCount = list?.Where(qitem => qitem.IsReach > 0)?.Count() ?? 0;
if (list != null && list.Count > 0)
{
//历史人头提成方案
......@@ -673,7 +688,11 @@ namespace Edu.Module.Course
monthData.CurrentStep = CurrentStep;
monthData.NextGoal = NextGoal;
monthData.NextBonus = awardAmount;
monthData.BonusMoney = (CurRewardMoney + OpenBonus + ClueNumSalary);
monthData.CurRewardMoney = CurRewardMoney;
monthData.OpenBonus = OpenBonus;
monthData.ClueNumSalary = ClueNumSalary;
monthData.TotalBonusMoney = (CurRewardMoney + OpenBonus + ClueNumSalary);
monthData.ClueCount = stuModel?.ClueCount ?? 0;
break;
}
}
......@@ -700,7 +719,10 @@ namespace Edu.Module.Course
}, isGetDetail: true);
if (list != null && list.Count > 0)
{
yearData.BonusMoney = list?.Sum(qitem => qitem.CurRewardMoney + qitem.ClueNumSalary + qitem.OpenBonus - qitem.BeforeMoney) ?? 0;
yearData.TotalBonusMoney = list?.Sum(qitem => qitem.CurRewardMoney + qitem.ClueNumSalary + qitem.OpenBonus) ?? 0;
yearData.CurRewardMoney= list?.Sum(qitem => qitem.CurRewardMoney) ?? 0;
yearData.ClueNumSalary = list?.Sum(qitem => qitem.ClueNumSalary)??0;
yearData.OpenBonus = list?.Sum(qitem => qitem.OpenBonus) ?? 0;
yearData.GuestNum = list?.Sum(qitem => qitem.CurGuestNum) ?? 0;
yearData.OrderCount = list?.Sum(qitem => qitem?.DeductionList?.Count) ?? 0;
yearData.ReachCount = list?.Where(qitem => qitem.IsReach == 1)?.Count() ?? 0;
......@@ -708,8 +730,11 @@ namespace Edu.Module.Course
if (Year == CurrentYear)
{
var monData = GetCurrentMonthData(user);
yearData.BonusMoney += monData?.BonusMoney ?? 0;
yearData.GuestNum+= monData?.GuestNum ?? 0;
yearData.TotalBonusMoney += monData?.TotalBonusMoney ?? 0;
yearData.ClueNumSalary += monData?.ClueNumSalary ?? 0;
yearData.OpenBonus += monData?.OpenBonus ?? 0;
yearData.CurRewardMoney += monData?.CurRewardMoney ?? 0;
yearData.GuestNum += monData?.GuestNum ?? 0;
yearData.OrderCount += monData?.OrderCount ?? 0;
yearData.ReachCount += monData?.ReachCount ?? 0;
}
......@@ -724,7 +749,7 @@ namespace Edu.Module.Course
/// <param name="CurrentStep"></param>
/// <param name="NextGoal"></param>
/// <param name="awardAmount"></param>
public void GetNextGoal(int GuestNum, CurrentMonthBonusData hisData,out int CurrentStep,out string NextGoal, out decimal awardAmount)
public void GetNextGoal(int GuestNum, CurrentMonthBonusData hisData, out int CurrentStep, out string NextGoal, out decimal awardAmount)
{
awardAmount = 0;
NextGoal = "";
......@@ -749,11 +774,11 @@ namespace Edu.Module.Course
{
CurrentStep = (i + 1);
awardAmount = hisData.DetailList[i + 1].Money;
NextGoal = string.Format("距{0}档还差{1}个", (i+1+1), hisData.DetailList[i + 1].StartNum - GuestNum);
NextGoal = string.Format("距{0}档还差{1}个", (i + 1 + 1), hisData.DetailList[i + 1].StartNum - GuestNum);
}
else
{
CurrentStep = (i+1);
CurrentStep = (i + 1);
awardAmount = tempNum.Money;
NextGoal = string.Format("已完成当月目标!");
}
......@@ -819,7 +844,22 @@ namespace Edu.Module.Course
/// <summary>
/// 奖金
/// </summary>
public decimal BonusMoney { get; set; }
public decimal TotalBonusMoney { get; set; }
/// <summary>
/// 开单奖励
/// </summary>
public decimal OpenBonus { get; set; }
/// <summary>
/// 线索奖励
/// </summary>
public decimal ClueNumSalary { get; set; }
/// <summary>
/// 人头奖励
/// </summary>
public decimal CurRewardMoney { get; set; }
/// <summary>
/// 开单数量
......@@ -841,6 +881,11 @@ namespace Edu.Module.Course
/// </summary>
public int CurrentStep { get; set; }
/// <summary>
/// 线索条数
/// </summary>
public int ClueCount { get; set; }
/// <summary>
/// 下一个目标字符串
/// </summary>
......
Edu.Module.User/StudentModule.cs
View file @ 4f4ffe96
......@@ -659,7 +659,24 @@ namespace Edu.Module.User
/// <returns></returns>
public object GetStudentTodayStaticModule(int createBy)
{
DateTime startTime = DateTime.Now.AddMonths(-1);
string startDate = Common.ConvertHelper.FormatDate(startTime);
var today = Common.ConvertHelper.FormatDate(DateTime.Now);
//今日新增名单
var addList = studentRepository.GetStudentStaticRepository(createBy.ToString(), startDate, today);
int days = (DateTime.Now - startTime).Days;
List<object> dayList = new List<object>();
for (int i = 1; i <= days; i++)
{
var newDate= startTime.AddDays(i);
dayList.Add(new
{
x = Common.ConvertHelper.FormatMonthDay(newDate),
y = addList?.FirstOrDefault(qitem => Common.ConvertHelper.FormatDate(qitem.CreateTime) == Common.ConvertHelper.FormatDate(newDate))?.ClueCount ?? 0
});
}
//今日新增名单
int todayAdd = studentRepository.GetStudentStaticRepository(createBy.ToString(), today, today)?.FirstOrDefault()?.ClueCount ?? 0;
//今日到访
......@@ -694,6 +711,7 @@ namespace Edu.Module.User
object obj = new
{
dayList,
todayAdd,
todayVisit,
appointmentCount,
......
Edu.Repository/User/RB_StudentRepository.cs
View file @ 4f4ffe96
......@@ -746,11 +746,24 @@ WHERE 1=1
{
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
SELECT CreateBy,Count(1) AS ClueCount
SELECT CreateBy,DATE_FORMAT(CreateTime,'%Y-%m-%d') AS CreateTime,Count(1) AS ClueCount
FROM RB_Student
WHERE Status=0 AND CreateBy IN({0}) and CreateTime>='{1}' and CreateTime<='{2} 23:59:59'
", createByIds, startDate, endDate);
builder.AppendFormat(" GROUP BY CreateBy ");
WHERE Status=0
");
if (!string.IsNullOrEmpty(createByIds))
{
builder.AppendFormat(" AND CreateBy IN({0}) ", createByIds);
}
if (!string.IsNullOrEmpty(startDate))
{
builder.AppendFormat(" AND CreateTime>='{0}' ", startDate);
}
if (!string.IsNullOrEmpty(endDate))
{
builder.AppendFormat(" AND CreateTime<='{0} 23:59:59' ", endDate);
}
builder.AppendFormat(" GROUP BY CreateBy,DATE_FORMAT(CreateTime,'%Y/%m/%d') ");
builder.AppendFormat(" ORDER BY CreateBy,DATE_FORMAT(CreateTime,'%Y/%m/%d') ");
var list = Get<RB_Student_ViewModel>(builder.ToString()).ToList();
return 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