Commit ac67e3c0 authored by 罗超's avatar 罗超

Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

parents 19c42320 2f083632
...@@ -136,5 +136,11 @@ namespace Edu.Model.Entity.StudyAbroad ...@@ -136,5 +136,11 @@ namespace Edu.Model.Entity.StudyAbroad
/// 封面图 /// 封面图
/// </summary> /// </summary>
public string ImgCover { get; set; } public string ImgCover { get; set; }
}
/// <summary>
/// 确认时间(确认后 才能发提成 才进报表)
/// </summary>
public DateTime? ConfirmDate { get; set; }
}
} }
...@@ -88,8 +88,6 @@ namespace Edu.Model.ViewModel.Course ...@@ -88,8 +88,6 @@ namespace Edu.Model.ViewModel.Course
get; set; get; set;
} }
/// <summary> /// <summary>
/// 课程编号 /// 课程编号
/// </summary> /// </summary>
......
...@@ -84,5 +84,15 @@ namespace Edu.Model.ViewModel.StudyAbroad ...@@ -84,5 +84,15 @@ namespace Edu.Model.ViewModel.StudyAbroad
/// 结束时间 /// 结束时间
/// </summary> /// </summary>
public string EndTime { get; set; } public string EndTime { get; set; }
/// <summary>
/// 确认开始时间
/// </summary>
public string ConfirmSTime { get; set; }
/// <summary>
/// 确认结束时间
/// </summary>
public string ConfirmETime { get; set; }
} }
} }
...@@ -207,8 +207,6 @@ namespace Edu.Module.Course ...@@ -207,8 +207,6 @@ namespace Edu.Module.Course
return class_TimeRepository.GetClassTimeList(query); return class_TimeRepository.GetClassTimeList(query);
} }
/// <summary> /// <summary>
/// 获取班级分页列表 /// 获取班级分页列表
/// </summary> /// </summary>
...@@ -268,24 +266,6 @@ namespace Edu.Module.Course ...@@ -268,24 +266,6 @@ namespace Edu.Module.Course
return classLogRepository.GetClassLogPageListRepository(pageIndex, pageSize, out rowsCount, query); return classLogRepository.GetClassLogPageListRepository(pageIndex, pageSize, out rowsCount, query);
} }
/// <summary>
/// 检查班级是否存在
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public bool ExistsClassModule(RB_Class_ViewModel model)
{
List<WhereHelper> wheres = new List<WhereHelper>()
{
new WhereHelper (nameof(RB_Class_ViewModel.ClassName),model.ClassName.Trim()),
};
if (model.ClassId > 0)
{
wheres.Add(new WhereHelper(nameof(RB_Class_ViewModel.ClassId), model.ClassId, OperatorEnum.NotEqual));
}
return classRepository.Exists(wheres);
}
/// <summary> /// <summary>
/// 新增修改班级 /// 新增修改班级
/// </summary> /// </summary>
...@@ -651,10 +631,6 @@ namespace Edu.Module.Course ...@@ -651,10 +631,6 @@ namespace Edu.Module.Course
if (model.ClassHours > 0) if (model.ClassHours > 0)
{ {
var srartDate = model.OpenTime; var srartDate = model.OpenTime;
// var BasicMinutes = class_ConfigRepository.GetBasicMinutesRepository(model.Group_Id);
//按周排课和按月排课 //按周排课和按月排课
if (model.ClassStyle == ClassStyleEnum.Week || model.ClassStyle == ClassStyleEnum.Month) if (model.ClassStyle == ClassStyleEnum.Week || model.ClassStyle == ClassStyleEnum.Month)
{ {
...@@ -988,8 +964,6 @@ namespace Edu.Module.Course ...@@ -988,8 +964,6 @@ namespace Edu.Module.Course
return list; return list;
} }
/// <summary> /// <summary>
/// 获取班级计划列表 /// 获取班级计划列表
/// </summary> /// </summary>
...@@ -1252,7 +1226,7 @@ namespace Edu.Module.Course ...@@ -1252,7 +1226,7 @@ namespace Edu.Module.Course
CreateTimeStr = Common.ConvertHelper.FormatTime(item.CreateTime), CreateTimeStr = Common.ConvertHelper.FormatTime(item.CreateTime),
item.Mobile, item.Mobile,
item.OrderId, item.OrderId,
ClassHours = classModel?.ClassHours ?? 0, ClassHours = item.CompleteHours + "-" + (classModel?.ClassHours ?? 0),
IsRenew = courseModel?.IsRenew ?? 0, IsRenew = courseModel?.IsRenew ?? 0,
CheckStatus = checkStatus, CheckStatus = checkStatus,
item.IsChaBan, item.IsChaBan,
...@@ -1438,41 +1412,21 @@ namespace Edu.Module.Course ...@@ -1438,41 +1412,21 @@ namespace Edu.Module.Course
} }
/// <summary> /// <summary>
/// 初始化签到 /// 初始化缺勤数据
/// </summary> /// </summary>
/// <param name="Ids"></param>
/// <param name="DropOutRemark"></param>
/// <returns></returns> /// <returns></returns>
public virtual bool InitClassCheckModule() public bool InitDataModule()
{ {
List<RB_Class_Check_ViewModel> list = new List<RB_Class_Check_ViewModel>();
bool flag = true; bool flag = true;
var checkList = classCheckRepository.GetClassCheckListRepository(new RB_Class_Check_ViewModel()); var list = GetClassCheckListRepository(new RB_Class_Check_ViewModel());
var planList = class_PlanRepository.GetClassPlanListExtRepository(new RB_Class_Plan_ViewModel()); var tempList = list?.Where(qitem => qitem.CheckStatus > 0)?.ToList();
if (checkList != null && checkList.Count > 0)
foreach (var item in tempList)
{ {
var groupList = checkList.GroupBy(qitem => new { qitem.ClassId, qitem.ClassDate, qitem.OrderGuestId }) if (item.ClassId > 5)
.Select(qitem => new { qitem.Key.ClassId, qitem.Key.ClassDate, qitem.Key.OrderGuestId });
foreach (var item in groupList)
{ {
var tempCheckList = checkList.Where(qitem => qitem.ClassId == item.ClassId && qitem.ClassDate == item.ClassDate && qitem.OrderGuestId == item.OrderGuestId).OrderBy(qitem => qitem.ClassTimeId).ToList(); var guestModel = order_GuestRepository.GetEntity(item.OrderGuestId);
var tempPlanList = planList.Where(qitem => qitem.ClassId == item.ClassId && qitem.ClassDate == item.ClassDate).OrderBy(qitem => qitem.ClassTimeId).ToList(); flag = CalcGuestHoursModule(guestModel, item);
for (var i = 0; i < tempCheckList.Count; i++)
{
if (tempPlanList != null && tempPlanList.Count > 0)
{
var cItem = tempCheckList[i];
cItem.ClassTimeId = tempPlanList[i].ClassTimeId;
if (flag)
{
flag = classCheckRepository.Update(cItem);
}
else
{
return false;
}
}
}
} }
} }
return flag; return flag;
...@@ -1807,7 +1761,6 @@ namespace Edu.Module.Course ...@@ -1807,7 +1761,6 @@ namespace Edu.Module.Course
[TransactionCallHandler] [TransactionCallHandler]
public bool SetClassLessPlan(Class_LessonPlan_ViewModel model) public bool SetClassLessPlan(Class_LessonPlan_ViewModel model)
{ {
bool flag = false; bool flag = false;
if (model.LessonPlanList != null && model.LessonPlanList.Any()) if (model.LessonPlanList != null && model.LessonPlanList.Any())
{ {
......
...@@ -1143,6 +1143,7 @@ namespace Edu.Module.Course ...@@ -1143,6 +1143,7 @@ namespace Edu.Module.Course
ClassInfo = new ClassInfo = new
{ {
cModel.ClassName, cModel.ClassName,
cModel.ClassNo,
tModel?.TeacherName, tModel?.TeacherName,
tModel?.TeacherIcon, tModel?.TeacherIcon,
zModel?.AssistName, zModel?.AssistName,
......
...@@ -286,6 +286,40 @@ namespace Edu.Module.Course ...@@ -286,6 +286,40 @@ namespace Edu.Module.Course
} }
/// <summary>
/// 确认销售提成
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public bool UpdateSureSellCommission(int UserId, int Id)
{
IDictionary<string, object> fileds = new Dictionary<string, object>
{
{ nameof(RB_Sell_Commission_Details_ViewModel.SureStatus), 1 },
};
IList<WhereHelper> auditrecordWhereHelpers = new List<WhereHelper>
{
new WhereHelper()
{
FiledName = nameof(RB_Sell_Commission_Details_ViewModel.Id),
FiledValue = Id,
OperatorEnum = OperatorEnum.Equal
},
new WhereHelper()
{
FiledName = nameof(RB_Sell_Commission_Details_ViewModel.UserId),
FiledValue = UserId,
OperatorEnum = OperatorEnum.Equal
}
};
return sell_Commission_DetailsRepository.Update(fileds, auditrecordWhereHelpers);
}
/// <summary> /// <summary>
/// 获取提成统计 /// 获取提成统计
/// </summary> /// </summary>
...@@ -1623,7 +1657,8 @@ namespace Edu.Module.Course ...@@ -1623,7 +1657,8 @@ namespace Edu.Module.Course
var model = sell_Commission_PeriodsRepository.GetEntity(periodId); var model = sell_Commission_PeriodsRepository.GetEntity(periodId);
if (model == null) { return "周期不存在"; } if (model == null) { return "周期不存在"; }
List<int> EmpIdList = new List<int>(); List<int> EmpIdList = new List<int>();
if (!string.IsNullOrEmpty(model.EmpIds)) { if (!string.IsNullOrEmpty(model.EmpIds))
{
EmpIdList = JsonHelper.DeserializeObject<List<int>>("[" + model.EmpIds + "]"); EmpIdList = JsonHelper.DeserializeObject<List<int>>("[" + model.EmpIds + "]");
} }
var list = GetSellCommissionUserList(new RB_Sell_Commission_Details_ViewModel() { Group_Id = userInfo.Group_Id, PeriodId = periodId }); var list = GetSellCommissionUserList(new RB_Sell_Commission_Details_ViewModel() { Group_Id = userInfo.Group_Id, PeriodId = periodId });
...@@ -1654,8 +1689,10 @@ namespace Edu.Module.Course ...@@ -1654,8 +1689,10 @@ namespace Edu.Module.Course
EmpIdList = JsonHelper.DeserializeObject<List<int>>("[" + model.EmpIds + "]"); EmpIdList = JsonHelper.DeserializeObject<List<int>>("[" + model.EmpIds + "]");
} }
List<int> NewIdList = JsonHelper.DeserializeObject<List<int>>("[" + empIds + "]"); List<int> NewIdList = JsonHelper.DeserializeObject<List<int>>("[" + empIds + "]");
foreach (var item in NewIdList) { foreach (var item in NewIdList)
if (EmpIdList.Contains(item)) { {
if (EmpIdList.Contains(item))
{
return "用户ID" + item + "已发放了提成,无法重复发放"; return "用户ID" + item + "已发放了提成,无法重复发放";
} }
} }
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -538,7 +538,7 @@ ORDER BY tt.ClassDate ASC ...@@ -538,7 +538,7 @@ ORDER BY tt.ClassDate ASC
/// <param name="contractNo"></param> /// <param name="contractNo"></param>
/// <param name="groupId"></param> /// <param name="groupId"></param>
/// <returns></returns> /// <returns></returns>
public List<RB_Class_Check_ViewModel> GetStudentConsumptionHoursDetialList(int teacherId, int schoolId, int classId, string startMonth, string endMonth, string studentName, int orderId, string contractNo, int groupId) public List<RB_Class_Check_ViewModel> GetStudentConsumptionHoursDetialList(int teacherId, int schoolId, int classId, string startMonth, string endMonth, string studentName, int orderId, string contractNo, int groupId, string classIds="")
{ {
string where = $@" "; string where = $@" ";
if (teacherId > 0) if (teacherId > 0)
...@@ -553,6 +553,10 @@ ORDER BY tt.ClassDate ASC ...@@ -553,6 +553,10 @@ ORDER BY tt.ClassDate ASC
{ {
where += $@" and p.ClassId ={classId}"; where += $@" and p.ClassId ={classId}";
} }
if (!string.IsNullOrEmpty(classIds) && classIds != "0")
{
where += $@" and p.ClassId in({classIds})";
}
if (!string.IsNullOrEmpty(studentName)) if (!string.IsNullOrEmpty(studentName))
{ {
where += $@" and t2.GuestName like '%{studentName}%'"; where += $@" and t2.GuestName like '%{studentName}%'";
...@@ -647,5 +651,40 @@ GROUP BY tt.ClassId,tt.OrderGuestId ...@@ -647,5 +651,40 @@ GROUP BY tt.ClassId,tt.OrderGuestId
} }
#endregion #endregion
#region 简易报表
/// <summary>
/// 获取时间范围内的班级
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="count"></param>
/// <param name="startTime"></param>
/// <param name="endTime"></param>
/// <param name="classId"></param>
/// <param name="classNo"></param>
/// <param name="group_Id"></param>
/// <returns></returns>
public List<RB_Class_Check_ViewModel> GetAllClassNowMonthStatistics(string startTime, string endTime, int classId, string classNo, int group_Id)
{
string where = "";
if (classId > 0) {
where += " and cc.ClassId =" + classId;
}
if (!string.IsNullOrEmpty(classNo)) {
where += " and c.ClassNo ='" + classNo + "'";
}
string sql = $@"
SELECT q.ClassId,q.ClassNo,q.ClassName,SUM(q.CurrentDeductionHours) AS CurrentDeductionHours FROM(
SELECT cc.ClassId,cc.ClassDate,cc.ClassTimeId,MAX(cc.CurrentDeductionHours) as CurrentDeductionHours,
c.ClassName,c.ClassNo
FROM rb_class_check cc
LEFT JOIN rb_class c on cc.ClassId = c.ClassId
WHERE cc.`Status` =0 and cc.Group_Id ={group_Id} and cc.ClassDate >='{startTime}' and cc.ClassDate <='{endTime} 23:59:59' {where} GROUP BY cc.ClassId,cc.ClassDate,cc.ClassTimeId)q GROUP BY q.ClassId";
return Get<RB_Class_Check_ViewModel>(sql).ToList();
}
#endregion
} }
} }
...@@ -378,7 +378,7 @@ WHERE p.`Status`=0 AND p.Group_Id={group_Id} AND p.ClassId ={classId} ...@@ -378,7 +378,7 @@ WHERE p.`Status`=0 AND p.Group_Id={group_Id} AND p.ClassId ={classId}
//LEFT JOIN (SELECT ClassPlanId,COUNT(*) as LessonPlanSummaryNum from rb_class_lessonplan where `Status`=0 and ISNULL(Summary)=0 and LENGTH(trim(Summary))>0 GROUP BY ClassPlanId)as lps on a.ClassPlanId=lps.ClassPlanId //LEFT JOIN (SELECT ClassPlanId,COUNT(*) as LessonPlanSummaryNum from rb_class_lessonplan where `Status`=0 and ISNULL(Summary)=0 and LENGTH(trim(Summary))>0 GROUP BY ClassPlanId)as lps on a.ClassPlanId=lps.ClassPlanId
//WHERE 1=1 and class.ClassStatus=2 and t.`Status`=0 //WHERE 1=1 and class.ClassStatus=2 and t.`Status`=0
// "); // ");
// builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.Status), (int)DateStateEnum.Normal); // builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.Status), (int)DateStateEnum.Normal);
if (query != null) if (query != null)
{ {
if (query.ClassId > 0) if (query.ClassId > 0)
...@@ -419,7 +419,7 @@ WHERE p.`Status`=0 AND p.Group_Id={group_Id} AND p.ClassId ={classId} ...@@ -419,7 +419,7 @@ WHERE p.`Status`=0 AND p.Group_Id={group_Id} AND p.ClassId ={classId}
} }
} }
// return Get<RB_Class_Plan_ViewModel>(builder.ToString()).ToList(); // return Get<RB_Class_Plan_ViewModel>(builder.ToString()).ToList();
//// string sql = $@" //// string sql = $@"
////SELECT * from (SELECT IF ////SELECT * from (SELECT IF
...@@ -441,8 +441,8 @@ WHERE p.`Status`=0 AND p.Group_Id={group_Id} AND p.ClassId ={classId} ...@@ -441,8 +441,8 @@ WHERE p.`Status`=0 AND p.Group_Id={group_Id} AND p.ClassId ={classId}
////( SELECT @rank := 0, @class := 0, @score := '2020-01-01', @colum := 0 ) r ////( SELECT @rank := 0, @class := 0, @score := '2020-01-01', @colum := 0 ) r
////WHERE 1=1 and class.ClassStatus=2 and t.`Status`=0 and a.`Status`=0 ORDER BY a.ClassId,a.ClassDate) as a where 1=1 {builder.ToString()} "; ////WHERE 1=1 and class.ClassStatus=2 and t.`Status`=0 and a.`Status`=0 ORDER BY a.ClassId,a.ClassDate) as a where 1=1 {builder.ToString()} ";
string sql = $@"CALL proc_GetClassPlanRank('{builder.ToString()}')"; string sql = $@"CALL proc_GetClassPlanRank('{builder.ToString()}')";
return Get<RB_Class_Plan_ViewModel>(sql).ToList(); return Get<RB_Class_Plan_ViewModel>(sql).ToList();
} }
......
...@@ -249,5 +249,22 @@ FROM ...@@ -249,5 +249,22 @@ FROM
LEFT JOIN rb_sell_commission_periods AS p ON r.PeriodId = p.Id where {where} "; LEFT JOIN rb_sell_commission_periods AS p ON r.PeriodId = p.Id where {where} ";
return Get<RB_Sell_Commission_Details_ViewModel>(sql).ToList(); return Get<RB_Sell_Commission_Details_ViewModel>(sql).ToList();
} }
/// <summary>
/// 获取日期范围 应发放的销售提成
/// </summary>
/// <param name="group_Id"></param>
/// <param name="classIds"></param>
/// <param name="startTime"></param>
/// <param name="endTime"></param>
/// <returns></returns>
public List<RB_Sell_Commission_Details_ViewModel> GetSellCommissionForDate(int group_Id, string classIds, string startTime, string endTime)
{
string sql = $@"SELECT d.ClassId,SUM(d.CurrentPeriodMoney + d.CurrentExtraMoney + d.DeductionMoney + d.DeductionExtraMoney) AS CurrentPeriodMoney FROM rb_sell_commission_details d
INNER JOIN rb_sell_commission_periods p on d.PeriodId = p.Id
WHERE p.Group_Id ={group_Id} and d.ClassId in ({classIds}) and STR_TO_DATE(CONCAT(p.Periods,'-01'),'%Y-%m-%d') >='{startTime}' and STR_TO_DATE(CONCAT(p.Periods,'-01'),'%Y-%m-%d') <='{endTime} 23:59:59'
GROUP BY d.ClassId";
return Get<RB_Sell_Commission_Details_ViewModel>(sql).ToList();
}
} }
} }
...@@ -341,7 +341,24 @@ where {where}"; ...@@ -341,7 +341,24 @@ where {where}";
{ {
where += $@" and DATE_FORMAT(STR_TO_DATE(CONCAT(b.Month,'-01'),'%Y-%m-%d'),'%Y-%m-%d')>=DATE_FORMAT('{demodel.Month}','%Y-%m-%d')"; where += $@" and DATE_FORMAT(STR_TO_DATE(CONCAT(b.Month,'-01'),'%Y-%m-%d'),'%Y-%m-%d')>=DATE_FORMAT('{demodel.Month}','%Y-%m-%d')";
} }
string sql = $@" select A.*,,b.`Month` from RB_Teaching_BonusDetail as A LEFT JOIN rb_teaching_bonus as b on a.BonusId=b.Id where {where} order by a.Id desc"; string sql = $@" select A.*,b.`Month` from RB_Teaching_BonusDetail as A LEFT JOIN rb_teaching_bonus as b on a.BonusId=b.Id where {where} order by a.Id desc";
return Get<RB_Teaching_BonusDetail_ViewModel>(sql).ToList();
}
/// <summary>
/// 获取时间范围老师课时费
/// </summary>
/// <param name="group_Id"></param>
/// <param name="classIds"></param>
/// <param name="startTime"></param>
/// <param name="endTime"></param>
/// <returns></returns>
public List<RB_Teaching_BonusDetail_ViewModel> GetTeacherBonusForDate(int group_Id, string classIds, string startTime, string endTime)
{
string sql = $@"SELECT d.ClassId,SUM(d.Money) AS Money FROM rb_teaching_bonusdetail d
INNER JOIN rb_teaching_bonus p on d.BonusId = p.Id
WHERE p.Group_Id ={group_Id} and d.ClassId in ({classIds}) and STR_TO_DATE(CONCAT(p.`Month`,'-01'),'%Y-%m-%d') >='{startTime}' and STR_TO_DATE(CONCAT(p.`Month`,'-01'),'%Y-%m-%d') <='{endTime} 23:59:59'
GROUP BY d.ClassId";
return Get<RB_Teaching_BonusDetail_ViewModel>(sql).ToList(); return Get<RB_Teaching_BonusDetail_ViewModel>(sql).ToList();
} }
} }
......
...@@ -249,5 +249,21 @@ where {where}"; ...@@ -249,5 +249,21 @@ where {where}";
var obj = ExecuteScalar(sql); var obj = ExecuteScalar(sql);
return obj == null ? 0 : Convert.ToDecimal(obj); return obj == null ? 0 : Convert.ToDecimal(obj);
} }
/// <summary>
/// 获取时间范围 班级绩效
/// </summary>
/// <param name="group_Id"></param>
/// <param name="classIds"></param>
/// <param name="sTime"></param>
/// <param name="eTime"></param>
/// <returns></returns>
public List<RB_Teaching_Perf_ViewModel> GetTeacherPerfForDate(int group_Id, string classIds, string sTime, string eTime)
{
string sql = $@"SELECT d.ClassId,SUM(d.Money) AS Money FROM rb_teaching_perf d
WHERE d.Group_Id ={group_Id} and d.ClassId in ({classIds}) and d.ConfirmDate >='{sTime}' and d.ConfirmDate <='{eTime} 23:59:59'
GROUP BY d.ClassId";
return Get<RB_Teaching_Perf_ViewModel>(sql).ToList();
}
} }
} }
...@@ -177,6 +177,10 @@ namespace Edu.Repository.Finance ...@@ -177,6 +177,10 @@ namespace Edu.Repository.Finance
{ {
where += string.Format(" AND A." + nameof(RB_Finance.RB_Branch_Id) + "={0}", model.RB_Branch_Id); where += string.Format(" AND A." + nameof(RB_Finance.RB_Branch_Id) + "={0}", model.RB_Branch_Id);
} }
if (model.RB_Group_Id > 0)
{
where += string.Format(" AND A." + nameof(RB_Finance.RB_Group_Id) + "={0}", model.RB_Group_Id);
}
if (model.OrderSource.HasValue) if (model.OrderSource.HasValue)
{ {
where += string.Format(" AND A." + nameof(RB_Finance.OrderSource) + "={0}", (int)model.OrderSource); where += string.Format(" AND A." + nameof(RB_Finance.OrderSource) + "={0}", (int)model.OrderSource);
...@@ -203,7 +207,6 @@ WHERE {1} {2} ", TableName, where, " ORDER BY A.FrID DESC"); ...@@ -203,7 +207,6 @@ WHERE {1} {2} ", TableName, where, " ORDER BY A.FrID DESC");
where.Append(" and b.Status in(1,2,5) and b.Is_Auto=0 "); where.Append(" and b.Status in(1,2,5) and b.Is_Auto=0 ");
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
//老徐喊修改的 2019-05-11 收款用交易日期 付款用制单日期 //老徐喊修改的 2019-05-11 收款用交易日期 付款用制单日期
if (model.sAduitDate.HasValue && model.eAduitDate.HasValue) if (model.sAduitDate.HasValue && model.eAduitDate.HasValue)
{ {
where.Append(" AND case when b.Type=2 then b.CreateDate>='" + model.sAduitDate.Value.ToString("yyyy-MM-dd") + "' and b.CreateDate<='" + model.eAduitDate.Value.ToString("yyyy-MM-dd") + " 23:59:59' else b.TradeDate>='" + model.sAduitDate.Value.ToString("yyyy-MM-dd") + "' and b." + nameof(RB_Finance.TradeDate) + "<='" + model.eAduitDate.Value.ToString("yyyy-MM-dd") + " 23:59:59' end"); where.Append(" AND case when b.Type=2 then b.CreateDate>='" + model.sAduitDate.Value.ToString("yyyy-MM-dd") + "' and b.CreateDate<='" + model.eAduitDate.Value.ToString("yyyy-MM-dd") + " 23:59:59' else b.TradeDate>='" + model.sAduitDate.Value.ToString("yyyy-MM-dd") + "' and b." + nameof(RB_Finance.TradeDate) + "<='" + model.eAduitDate.Value.ToString("yyyy-MM-dd") + " 23:59:59' end");
...@@ -234,16 +237,13 @@ WHERE {1} {2} ", TableName, where, " ORDER BY A.FrID DESC"); ...@@ -234,16 +237,13 @@ WHERE {1} {2} ", TableName, where, " ORDER BY A.FrID DESC");
} }
if (model.OrderSource.HasValue) if (model.OrderSource.HasValue)
{ {
where.Append(" and IFNULL(b.OrderSource,0)!=" + (int)model.OrderSource); where.Append(" and IFNULL(b.OrderSource,0) =" + (int)model.OrderSource);
} }
if (model.Is_TCID == 1) if (model.FinanceType.HasValue && model.FinanceType > 0)
{
where.Append(" and IFNULL(b.OrderSource,0) not in(" + (int)OrderResourceEnum.BulkAirTicket + "," + (int)OrderResourceEnum.DomesticTicket + "," + (int)OrderResourceEnum.TicketService + "," + (int)OrderResourceEnum.Visia + ")");
}
if (model.Is_ProfitFoHF == 1)
{ {
where.Append($@" And case when td.{nameof(RB_TradeWay.Type)}={(int)BranchAccountEnum.CashPool} then td.AccountId not in (14,15,19,20,21,22,23) else 1=1 end ");//日本 老挝地接部专户 where.Append(" AND b." + nameof(RB_Finance.FinanceType) + "=" + model.FinanceType + "");
} }
builder.AppendFormat(@"select distinct b.FrID,IFNULL(b.MatchMoney,0) as MatchMoney,IFNULL(E.TCID,0)TCID,D.Name,b.Status,b.TradeDate,b.CreateDate,b.RB_Branch_Id,a.ID,a.CostTypeId,IFNULL(b.Is_Cashier,0)Is_Cashier,a.Money,b.OrderID,b.OrderSource,b.SourceID,IFNULL(b.PayMoney,0)PayMoney,IFNULL(b.Fee,0)Fee,b.Type builder.AppendFormat(@"select distinct b.FrID,IFNULL(b.MatchMoney,0) as MatchMoney,IFNULL(E.TCID,0)TCID,D.Name,b.Status,b.TradeDate,b.CreateDate,b.RB_Branch_Id,a.ID,a.CostTypeId,IFNULL(b.Is_Cashier,0)Is_Cashier,a.Money,b.OrderID,b.OrderSource,b.SourceID,IFNULL(b.PayMoney,0)PayMoney,IFNULL(b.Fee,0)Fee,b.Type
from rb_financedetail a INNER JOIN rb_finance as b on a.FinanceId=b.FrID and a.`Status`=0 from rb_financedetail a INNER JOIN rb_finance as b on a.FinanceId=b.FrID and a.`Status`=0
INNER JOIN rb_costtype AS D ON D.ID=a.CostTypeId INNER JOIN rb_costtype AS D ON D.ID=a.CostTypeId
......
...@@ -74,7 +74,11 @@ WHERE 1=1 "); ...@@ -74,7 +74,11 @@ WHERE 1=1 ");
} }
if (!string.IsNullOrEmpty(query.Title)) if (!string.IsNullOrEmpty(query.Title))
{ {
builder.AppendFormat(" AND A.{0} LIKE @Title ", nameof(RB_Question_ViewModel.Title)); builder.AppendFormat(" AND (A.{0} LIKE @Title OR A.{1} LIKE @Title OR A.{2} LIKE @Title) "
,nameof(RB_Question_ViewModel.Title)
,nameof(RB_Question_ViewModel.QuestionContent)
,nameof(RB_Question_ViewModel.AnswerParse)
);
parameters.Add("Title", "%" + query.Title.Trim() + "%"); parameters.Add("Title", "%" + query.Title.Trim() + "%");
} }
if (!string.IsNullOrEmpty(query.PointName)) if (!string.IsNullOrEmpty(query.PointName))
......
...@@ -229,6 +229,14 @@ WHERE 1=1 ...@@ -229,6 +229,14 @@ WHERE 1=1
{ {
builder.AppendFormat(" AND A.{0} <='{1} 23:59:59'", nameof(RB_StudyAbroad_ViewModel.CreateTime), query.EndTime); builder.AppendFormat(" AND A.{0} <='{1} 23:59:59'", nameof(RB_StudyAbroad_ViewModel.CreateTime), query.EndTime);
} }
if (!string.IsNullOrEmpty(query.ConfirmSTime))
{
builder.AppendFormat(" AND A.{0} >='{1}'", nameof(RB_StudyAbroad_ViewModel.ConfirmDate), query.ConfirmSTime);
}
if (!string.IsNullOrEmpty(query.ConfirmETime))
{
builder.AppendFormat(" AND A.{0} <='{1} 23:59:59'", nameof(RB_StudyAbroad_ViewModel.ConfirmDate), query.ConfirmETime);
}
return Get<RB_StudyAbroad_ViewModel>(builder.ToString(), parameters).ToList(); return Get<RB_StudyAbroad_ViewModel>(builder.ToString(), parameters).ToList();
} }
} }
......
...@@ -350,63 +350,14 @@ namespace Edu.WebApi.Controllers.Course ...@@ -350,63 +350,14 @@ namespace Edu.WebApi.Controllers.Course
} }
/// <summary> /// <summary>
/// 添加修改班级 /// 初始化数据
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public ApiResult InitClassTime() public ApiResult InitData()
{ {
bool flag = false; bool flag = classModule.InitDataModule();
var list = classModule.GetClassListModule(new RB_Class_ViewModel()); return flag ? ApiResult.Success() : ApiResult.Failed();
foreach (var item in list)
{
List<ClassTimeItem> dateList = new List<ClassTimeItem>();
if (!string.IsNullOrEmpty(item.DefaultTimeJson))
{
dateList = Common.Plugin.JsonHelper.DeserializeObject<List<ClassTimeItem>>(item.DefaultTimeJson);
}
foreach (var jItem in dateList)
{
if (jItem.TimeList != null && jItem.TimeList.Count > 0)
{
foreach (var sItem in jItem.TimeList)
{
var startDate = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd") + " " + sItem.StartTime + ":00");
var endDate = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd") + " " + sItem.EndTime + ":00");
TimeSpan span = endDate.Subtract(startDate);
if (sItem.TimeHour <= 0)
{
sItem.TimeHour = Convert.ToDecimal(span.TotalMinutes / classModule.GetBasicMinutesModule(item.Group_Id));
}
}
}
}
//flag = classModule.UpdateClassTimeModule(item.ClassId, Common.Plugin.JsonHelper.Serialize(dateList));
}
var classTimeList = classModule.GetClassTimeListModule(new RB_Class_Time_ViewModel());
int basicMintues= classModule.GetBasicMinutesModule(classTimeList[0].Group_Id);
Task.Run(() =>
{
foreach (var item in classTimeList)
{
var startDate = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd") + " " + item.StartTime + ":00");
var endDate = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd") + " " + item.EndTime + ":00");
TimeSpan span = endDate.Subtract(startDate);
if (item.TimeHour <= 0)
{
if (span.TotalMinutes % basicMintues == 0)
{
item.TimeHour = Convert.ToDecimal(span.TotalMinutes / basicMintues);
}
if (item.TimeHour > 0)
{
flag = classModule.UpdateClassPlanTimeModule(item.ClassTimeId, item.TimeHour);
}
}
}
});
return ApiResult.Success();
} }
/// <summary> /// <summary>
...@@ -993,17 +944,6 @@ namespace Edu.WebApi.Controllers.Course ...@@ -993,17 +944,6 @@ namespace Edu.WebApi.Controllers.Course
return result ? ApiResult.Success() : ApiResult.Failed("签到失败"); return result ? ApiResult.Success() : ApiResult.Failed("签到失败");
} }
/// <summary>
/// 初始化签到数据
/// </summary>
/// <returns></returns>
public ApiResult InitClassCheck()
{
bool result = classModule.InitClassCheckModule();
return result ? ApiResult.Success("初始化成功!") : ApiResult.Failed("初始化失败!");
//return ApiResult.Failed("初始化失败!");
}
/// <summary> /// <summary>
/// 签到 /// 签到
/// </summary> /// </summary>
......
...@@ -232,7 +232,7 @@ namespace Edu.WebApi.Controllers.Course ...@@ -232,7 +232,7 @@ namespace Edu.WebApi.Controllers.Course
/// <summary> /// <summary>
/// 老师上课计划统计 /// 教室使用记录
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
public ApiResult GetNewClassRoomTimeList() public ApiResult GetNewClassRoomTimeList()
......
...@@ -519,7 +519,14 @@ namespace Edu.WebApi.Controllers.Course ...@@ -519,7 +519,14 @@ namespace Edu.WebApi.Controllers.Course
[HttpPost] [HttpPost]
public ApiResult GetChapterTree() public ApiResult GetChapterTree()
{ {
var query = Common.Plugin.JsonHelper.DeserializeObject<RB_Course_Chapter_ViewModel>(RequestParm.Msg.ToString()); var query = new RB_Course_Chapter_ViewModel()
{
CourseId = base.ParmJObj.GetInt("CourseId"),
};
if (query.CourseId <= 0)
{
return ApiResult.ParamIsNull(message: "请传递课程编号!");
}
query.Group_Id = base.UserInfo.Group_Id; query.Group_Id = base.UserInfo.Group_Id;
query.School_Id = base.UserInfo.School_Id; query.School_Id = base.UserInfo.School_Id;
var list = courseModule.GetChapterTreeListModule(query); var list = courseModule.GetChapterTreeListModule(query);
...@@ -556,7 +563,12 @@ namespace Edu.WebApi.Controllers.Course ...@@ -556,7 +563,12 @@ namespace Edu.WebApi.Controllers.Course
[HttpPost] [HttpPost]
public ApiResult BatchRemoveChapter() public ApiResult BatchRemoveChapter()
{ {
var extModel = Common.Plugin.JsonHelper.DeserializeObject<RB_Course_Chapter_ViewModel>(RequestParm.Msg.ToString()); var extModel = new RB_Course_Chapter_ViewModel()
{
CourseId=base.ParmJObj.GetInt("CourseId"),
ChapterNo=base.ParmJObj.GetStringValue("ChapterNo"),
ChapterId=base.ParmJObj.GetInt("ChapterId"),
};
bool flag = courseModule.BatchRemoveChapterModule(extModel); bool flag = courseModule.BatchRemoveChapterModule(extModel);
return flag ? ApiResult.Success() : ApiResult.Failed(); return flag ? ApiResult.Success() : ApiResult.Failed();
} }
......
...@@ -357,7 +357,15 @@ namespace Edu.WebApi.Controllers.Duty ...@@ -357,7 +357,15 @@ namespace Edu.WebApi.Controllers.Duty
public ApiResult DutyCheck() public ApiResult DutyCheck()
{ {
var Id = base.ParmJObj.GetInt("Id"); var Id = base.ParmJObj.GetInt("Id");
if (Id <= 0)
{
return ApiResult.ParamIsNull(message: "请传递值班编号!");
}
var Shift = base.ParmJObj.GetInt("Shift"); var Shift = base.ParmJObj.GetInt("Shift");
if (Shift <= 0)
{
return ApiResult.ParamIsNull(message: "请传递值班班次!");
}
var Status = base.ParmJObj.GetInt("Status"); var Status = base.ParmJObj.GetInt("Status");
//突发事件 //突发事件
int IsBurst = base.ParmJObj.GetInt("IsBurst"); int IsBurst = base.ParmJObj.GetInt("IsBurst");
......
...@@ -1349,7 +1349,7 @@ namespace Edu.WebApi.Controllers.Finance ...@@ -1349,7 +1349,7 @@ namespace Edu.WebApi.Controllers.Finance
} }
catch (Exception ex) catch (Exception ex)
{ {
LogHelper.Write(ex, "OutToExcelOrderStudentClassHoursList"); LogHelper.Write(ex, "OutToExcelOrderStudentClassHoursList:" + Common.Plugin.JsonHelper.Serialize(dmodel));
var byteData1 = ExcelTempLateHelper.ToExcelExtend(slist); var byteData1 = ExcelTempLateHelper.ToExcelExtend(slist);
return File(byteData1, "application/octet-stream", ExcelName); return File(byteData1, "application/octet-stream", ExcelName);
} }
...@@ -1545,7 +1545,7 @@ namespace Edu.WebApi.Controllers.Finance ...@@ -1545,7 +1545,7 @@ namespace Edu.WebApi.Controllers.Finance
} }
catch (Exception ex) catch (Exception ex)
{ {
LogHelper.Write(ex, "OutToExcelOrderStudentClassHoursList"); LogHelper.Write(ex, "OutToExcelOrderStudentClassHoursList:" + string.Format("TeacherId:{0},SchoolId:{1},StartMonth:{2},EndMonth:{3},Group_Id:{4}", TeacherId, SchoolId, StartMonth, EndMonth, userInfo.Group_Id));
var byteData1 = ExcelTempLateHelper.ToExcelExtend(slist); var byteData1 = ExcelTempLateHelper.ToExcelExtend(slist);
return File(byteData1, "application/octet-stream", ExcelName); return File(byteData1, "application/octet-stream", ExcelName);
} }
...@@ -1998,6 +1998,8 @@ namespace Edu.WebApi.Controllers.Finance ...@@ -1998,6 +1998,8 @@ namespace Edu.WebApi.Controllers.Finance
var userInfo = base.UserInfo; var userInfo = base.UserInfo;
string StartTime = base.ParmJObj.GetStringValue("StartTime");//开始时间 string StartTime = base.ParmJObj.GetStringValue("StartTime");//开始时间
string EndTime = base.ParmJObj.GetStringValue("EndTime");//结束时间 string EndTime = base.ParmJObj.GetStringValue("EndTime");//结束时间
int ClassId = base.ParmJObj.GetInt("ClassId", 0);
string ClassNo = base.ParmJObj.GetStringValue("ClassNo");//班号
if (string.IsNullOrEmpty(StartTime)) if (string.IsNullOrEmpty(StartTime))
{ {
return ApiResult.ParamIsNull(); return ApiResult.ParamIsNull();
...@@ -2016,7 +2018,7 @@ namespace Edu.WebApi.Controllers.Finance ...@@ -2016,7 +2018,7 @@ namespace Edu.WebApi.Controllers.Finance
return ApiResult.Failed("日期格式有误,请核实后再试"); return ApiResult.Failed("日期格式有误,请核实后再试");
} }
var Robj = financeModule.GetAllClassNowMonthStatistics(StartTime, EndTime, userInfo); var Robj = financeModule.GetAllClassNowMonthStatistics(StartTime, EndTime, ClassId, ClassNo, userInfo);
return ApiResult.Success("", Robj); return ApiResult.Success("", Robj);
} }
......
...@@ -1014,7 +1014,6 @@ namespace Edu.WebApi.Controllers.OKR ...@@ -1014,7 +1014,6 @@ namespace Edu.WebApi.Controllers.OKR
public ApiResult GetOKRMyEmployeeList() public ApiResult GetOKRMyEmployeeList()
{ {
var userInfo = base.UserInfo; var userInfo = base.UserInfo;
var obj = okrPeriodModule.GetOKRMyEmployeeList(userInfo); var obj = okrPeriodModule.GetOKRMyEmployeeList(userInfo);
return ApiResult.Success("", obj); return ApiResult.Success("", obj);
} }
......
...@@ -24,16 +24,6 @@ namespace Edu.WebApi.Controllers.User ...@@ -24,16 +24,6 @@ namespace Edu.WebApi.Controllers.User
[EnableCors("AllowCors")] [EnableCors("AllowCors")]
public class UserInfoController : BaseController public class UserInfoController : BaseController
{ {
/// <summary>
/// 集团处理类对象
/// </summary>
private readonly GroupModule groupModule = AOPHelper.CreateAOPObject<GroupModule>();
/// <summary>
/// 学校处理类对象
/// </summary>
private readonly SchoolModule schoolModule = AOPHelper.CreateAOPObject<SchoolModule>();
/// <summary> /// <summary>
/// 账户相关处理类对象 /// 账户相关处理类对象
/// </summary> /// </summary>
...@@ -48,14 +38,16 @@ namespace Edu.WebApi.Controllers.User ...@@ -48,14 +38,16 @@ namespace Edu.WebApi.Controllers.User
/// </summary> /// </summary>
private readonly SellCommissionModule sellCommissionModule = new SellCommissionModule(); private readonly SellCommissionModule sellCommissionModule = new SellCommissionModule();
/// <summary> /// <summary>
/// 教师奖励明细 /// 教师奖励明细
/// </summary> /// </summary>
private readonly TeachingRewardsModule teachingRewardsModule = new TeachingRewardsModule(); private readonly TeachingRewardsModule teachingRewardsModule = new TeachingRewardsModule();
/// <summary>
/// 订单处理类对象
/// </summary>
private readonly OrderModule orderModule = new OrderModule(); private readonly OrderModule orderModule = new OrderModule();
#region 个人资料-密码修改 #region 个人资料-密码修改
/// <summary> /// <summary>
/// 重置用户密码信息 /// 重置用户密码信息
...@@ -97,14 +89,16 @@ namespace Edu.WebApi.Controllers.User ...@@ -97,14 +89,16 @@ namespace Edu.WebApi.Controllers.User
} }
List<RB_Account_ViewModel> list = new List<RB_Account_ViewModel>(); List<RB_Account_ViewModel> list = new List<RB_Account_ViewModel>
list.Add(new RB_Account_ViewModel
{ {
Id = base.UserInfo.Id, new RB_Account_ViewModel
AccountId = base.UserInfo.AccountId, {
AccountType = base.UserInfo.AccountType, Id = base.UserInfo.Id,
Group_Id = base.UserInfo.Group_Id AccountId = base.UserInfo.AccountId,
}); AccountType = base.UserInfo.AccountType,
Group_Id = base.UserInfo.Group_Id
}
};
bool result = accountModule.SetBatchResetPassword(list, NewPassWord); bool result = accountModule.SetBatchResetPassword(list, NewPassWord);
if (result) if (result)
{ {
...@@ -248,12 +242,12 @@ namespace Edu.WebApi.Controllers.User ...@@ -248,12 +242,12 @@ namespace Edu.WebApi.Controllers.User
} }
else else
{ {
//userList = sellCommissionModule.GetEstimateSellCommissionInfo(System.DateTime.Now.ToString("yyyy-MM-01"), base.UserInfo); teacherList = teachingRewardsModule.GetEstimateTeachingBonusAdd(new RB_Teaching_Bonus_ViewModel { Month = System.DateTime.Now.ToString("yyyy-MM"), TeacherIds = base.UserInfo.Id.ToString() }, base.UserInfo);
//if (userList != null && userList.Any()) if (teacherList != null && teacherList.Any())
//{ {
// totalCommiommission = userList.Sum(x => x.CurrentPeriodMoney + x.CurrentExtraMoney + x.DeductionMoney + x.DeductionExtraMoney); totalTCommiommission = teacherList.Sum(x => x.Money);
//} }
} }
#endregion #endregion
#endregion #endregion
...@@ -371,6 +365,32 @@ namespace Edu.WebApi.Controllers.User ...@@ -371,6 +365,32 @@ namespace Edu.WebApi.Controllers.User
return ApiResult.Success("", commiommissionList); return ApiResult.Success("", commiommissionList);
} }
/// <summary>
/// 确认销售提成
/// </summary>
/// <returns></returns>
public ApiResult UpdateSureTeachingBonusDetail()
{
int Id = base.ParmJObj.GetInt("Id");
int UserId = base.UserInfo.AccountId;
bool retult = teachingRewardsModule.UpdateSureTeachingBonusDetail(UserId, Id);
return retult ? ApiResult.Success("") : ApiResult.Failed("确认失败");
}
/// <summary>
/// 确认销售提成
/// </summary>
/// <returns></returns>
public ApiResult UpdatSureSellCommission()
{
int Id = base.ParmJObj.GetInt("Id");
int UserId = base.UserInfo.Id;
bool retult = sellCommissionModule.UpdateSureSellCommission(UserId, Id);
return retult ? ApiResult.Success("") : ApiResult.Failed("确认失败");
}
#endregion #endregion
} }
} }
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