Skip to content

E
Education
Commit e5618a96 authored by 吴春's avatar 吴春
Browse files
Options

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

parents 0afc169f 4d46c2e0
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 357 additions and 28 deletions
Edu.Model/Entity/Course/RB_Order.cs
View file @ e5618a96
...@@ -56,6 +56,10 @@ namespace Edu.Model.Entity.Course ...@@ -56,6 +56,10 @@ namespace Edu.Model.Entity.Course
/// </summary> /// </summary>
public decimal DiscountMoney { get; set; } public decimal DiscountMoney { get; set; }
/// <summary> /// <summary>
/// 平台税金
/// </summary>
public decimal PlatformTax { get; set; }
/// <summary>
/// 订单状态 枚举 /// 订单状态 枚举
/// </summary> /// </summary>
public OrderStateEnum OrderState { get; set; } public OrderStateEnum OrderState { get; set; }
......
Edu.Module.Course/ClassModule.cs
View file @ e5618a96
...@@ -559,6 +559,10 @@ namespace Edu.Module.Course ...@@ -559,6 +559,10 @@ namespace Edu.Module.Course
{ {
foreach (var item in extModel.PlanTimeList) foreach (var item in extModel.PlanTimeList)
{ {
item.ClassId = extModel.ClassId;
item.ClassPlanId = extModel.ClassPlanId;
item.Group_Id = extModel.Group_Id;
item.School_Id = extModel.School_Id;
flag = class_TimeRepository.Insert(item) > 0; flag = class_TimeRepository.Insert(item) > 0;
} }
} }
......
Edu.Module.Course/OrderModule.cs
View file @ e5618a96
This diff is collapsed.
Edu.Module.Log/UserChangeLogModule.cs
View file @ e5618a96
...@@ -4,6 +4,9 @@ using Edu.Repository.Log; ...@@ -4,6 +4,9 @@ using Edu.Repository.Log;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
using System.Linq;
using Edu.Repository.User;
using Edu.Model.ViewModel.User;
namespace Edu.Module.Log namespace Edu.Module.Log
{ {
...@@ -14,14 +17,56 @@ namespace Edu.Module.Log ...@@ -14,14 +17,56 @@ namespace Edu.Module.Log
/// </summary> /// </summary>
private readonly RB_User_ChangeLogRepository changeLogRepository = new RB_User_ChangeLogRepository(); private readonly RB_User_ChangeLogRepository changeLogRepository = new RB_User_ChangeLogRepository();
/// <summary>
/// 账号仓储层对象
/// </summary>
private readonly RB_AccountRepository accountRepository = new RB_AccountRepository();
/// <summary> /// <summary>
/// 获取用户信息改变日志列表 /// 获取用户信息改变日志列表
/// </summary> /// </summary>
/// <param name="query"></param> /// <param name="query"></param>
/// <returns></returns> /// <returns></returns>
public List<RB_User_ChangeLog_ViewModel> GetUserChangeLogListModule(RB_User_ChangeLog_ViewModel query) public object GetUserChangeLogListModule(RB_User_ChangeLog_ViewModel query)
{ {
return changeLogRepository.GetUserChangeLogListRepository(query); List<object> list = new List<object>();
var logList= changeLogRepository.GetUserChangeLogListRepository(query);
if (logList != null && logList.Count > 0)
{
var empList = new List<Employee_ViewModel>();
string uids = string.Join(",", logList.Select(qitem => qitem.CreateBy));
if (!string.IsNullOrEmpty(uids))
{
empList= accountRepository.GetEmployeeListRepository(new Model.ViewModel.User.Employee_ViewModel()
{
QIds = uids
});
}
var dayList = logList.GroupBy(qitem => new { NewTime = Common.ConvertHelper.FormatDate(qitem.CreateTime) }).OrderByDescending(qitem => qitem.Key.NewTime).Select(qitem => new { qitem.Key.NewTime });
if (dayList != null && dayList.Count() > 0)
{
foreach (var item in dayList)
{
var subList = logList.Where(qitem => Common.ConvertHelper.FormatDate(qitem.CreateTime) == item.NewTime).ToList();
if (subList != null && subList.Count > 0)
{
list.Add(new
{
item.NewTime,
WeekStr = Common.ConvertHelper.GetWeekDay(Convert.ToDateTime(item.NewTime)),
LogList = subList.Select(qitem => new
{
TimeStr = Common.ConvertHelper.FormatTimeStr(qitem.CreateTime),
UserIcon = empList?.Where(eItem=> eItem.Id==qitem.CreateBy)?.FirstOrDefault()?.UserIcon??"",
CreateName = empList?.Where(eItem => eItem.Id == qitem.CreateBy)?.FirstOrDefault()?.EmployeeName ?? "",
qitem.LogContent
})
});
}
}
}
}
return list;
} }
/// <summary> /// <summary>
...@@ -33,6 +78,7 @@ namespace Edu.Module.Log ...@@ -33,6 +78,7 @@ namespace Edu.Module.Log
{ {
return changeLogRepository.Insert(extModel) > 0; return changeLogRepository.Insert(extModel) > 0;
} }
/// <summary> /// <summary>
/// 获取日志列表 /// 获取日志列表
/// </summary> /// </summary>
......
Edu.Repository/Course/RB_OrderRepository.cs
View file @ e5618a96
...@@ -177,7 +177,7 @@ where {where} order by {orderBy} ...@@ -177,7 +177,7 @@ where {where} order by {orderBy}
} }
if (demodel.Q_NotCollect == 1) if (demodel.Q_NotCollect == 1)
{ {
where += $@" and o.{nameof(RB_Order_ViewModel.PreferPrice)} > (o.{nameof(RB_Order_ViewModel.Income)} - o.{nameof(RB_Order_ViewModel.Refund)} + o.{nameof(RB_Order_ViewModel.DiscountMoney)}) "; where += $@" and o.{nameof(RB_Order_ViewModel.PreferPrice)} > (o.{nameof(RB_Order_ViewModel.Income)} - o.{nameof(RB_Order_ViewModel.Refund)} + o.{nameof(RB_Order_ViewModel.PlatformTax)} + o.{nameof(RB_Order_ViewModel.DiscountMoney)}) ";
} }
string orderBy = " o.OrderId asc"; string orderBy = " o.OrderId asc";
...@@ -268,7 +268,7 @@ where {where} order by {orderBy} ...@@ -268,7 +268,7 @@ where {where} order by {orderBy}
} }
if (demodel.Q_NotCollect == 1) if (demodel.Q_NotCollect == 1)
{ {
where += $@" and o.{nameof(RB_Order_ViewModel.PreferPrice)} > (o.{nameof(RB_Order_ViewModel.Income)} - o.{nameof(RB_Order_ViewModel.Refund)} + o.{nameof(RB_Order_ViewModel.DiscountMoney)}) "; where += $@" and o.{nameof(RB_Order_ViewModel.PreferPrice)} > (o.{nameof(RB_Order_ViewModel.Income)} - o.{nameof(RB_Order_ViewModel.Refund)} + o.{nameof(RB_Order_ViewModel.PlatformTax)} + o.{nameof(RB_Order_ViewModel.DiscountMoney)}) ";
} }
string sql = $@" select SUM(CASE WHEN o.OrderState <> 3 THEN o.PreferPrice ELSE 0 END) AS PreferPrice, string sql = $@" select SUM(CASE WHEN o.OrderState <> 3 THEN o.PreferPrice ELSE 0 END) AS PreferPrice,
......
Edu.Repository/Log/RB_User_ChangeLogRepository.cs
View file @ e5618a96
...@@ -51,6 +51,7 @@ WHERE 1=1 ...@@ -51,6 +51,7 @@ WHERE 1=1
builder.AppendFormat($" AND {nameof(RB_User_ChangeLog_ViewModel.SourceId)}={query.SourceId} "); builder.AppendFormat($" AND {nameof(RB_User_ChangeLog_ViewModel.SourceId)}={query.SourceId} ");
} }
} }
builder.Append(" ORDER BY CreateTime DESC ");
return Get<RB_User_ChangeLog_ViewModel>(builder.ToString()).ToList(); return Get<RB_User_ChangeLog_ViewModel>(builder.ToString()).ToList();
} }
......
Edu.Repository/User/RB_AccountRemarkRepository.cs
View file @ e5618a96
...@@ -119,7 +119,12 @@ namespace Edu.Repository.User ...@@ -119,7 +119,12 @@ namespace Edu.Repository.User
{ {
where += $@" and DATE_FORMAT({nameof(RB_AccountRemark_ViewModel.CreateTime)},'%Y-%m-%d' )<= DATE_FORMAT('{demodel.EndDate}','%Y-%m-%d' ) "; where += $@" and DATE_FORMAT({nameof(RB_AccountRemark_ViewModel.CreateTime)},'%Y-%m-%d' )<= DATE_FORMAT('{demodel.EndDate}','%Y-%m-%d' ) ";
} }
string sql = $@" SELECT DATE_FORMAT(CreateTime,'%Y-%m-%d') as CreateStr from rb_accountremark where `Status`=0 {where} GROUP BY DATE_FORMAT(CreateTime,'%Y-%m-%d') "; string sql = $@"
SELECT DATE_FORMAT(CreateTime,'%Y-%m-%d') as CreateStr from rb_accountremark where `Status`=0
{where}
GROUP BY DATE_FORMAT(CreateTime,'%Y-%m-%d')
ORDER BY DATE_FORMAT(CreateTime,'%Y-%m-%d') DESC
";
return GetPage<RB_AccountRemark_ViewList>(pageIndex, pageSize, out rowsCount, sql).ToList(); return GetPage<RB_AccountRemark_ViewList>(pageIndex, pageSize, out rowsCount, sql).ToList();
} }
/// <summary> /// <summary>
......
Edu.Repository/User/RB_AccountRepository.cs
View file @ e5618a96
...@@ -376,11 +376,6 @@ FROM ...@@ -376,11 +376,6 @@ FROM
return model; return model;
} }
/// <summary> /// <summary>
/// 获取账号列表(批量修改密码专用) /// 获取账号列表(批量修改密码专用)
/// </summary> /// </summary>
......
Edu.WebApi/Controllers/Course/ClassController.cs
View file @ e5618a96
...@@ -42,7 +42,6 @@ namespace Edu.WebApi.Controllers.Course ...@@ -42,7 +42,6 @@ namespace Edu.WebApi.Controllers.Course
School_Id = base.ParmJObj.GetInt("School_Id") School_Id = base.ParmJObj.GetInt("School_Id")
}; };
query.Group_Id = base.UserInfo.Group_Id; query.Group_Id = base.UserInfo.Group_Id;
//query.School_Id = base.UserInfo.School_Id;
List<object> result = new List<object>(); List<object> result = new List<object>();
var list = classModule.GetClassPageListModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query); var list = classModule.GetClassPageListModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
foreach (var item in list) foreach (var item in list)
...@@ -61,6 +60,7 @@ namespace Edu.WebApi.Controllers.Course ...@@ -61,6 +60,7 @@ namespace Edu.WebApi.Controllers.Course
item.ClassName, item.ClassName,
item.SchoolName, item.SchoolName,
item.CourseName, item.CourseName,
item.Teacher_Id,
item.TeacherName, item.TeacherName,
item.ClassPersion, item.ClassPersion,
item.OrderStudentCount, item.OrderStudentCount,
......
Edu.WebApi/Controllers/Course/OrderController.cs
View file @ e5618a96
...@@ -118,7 +118,8 @@ namespace Edu.WebApi.Controllers.Course ...@@ -118,7 +118,8 @@ namespace Edu.WebApi.Controllers.Course
x.Income, x.Income,
x.Refund, x.Refund,
x.DiscountMoney, x.DiscountMoney,
DueInMoney = x.PreferPrice - (x.Income - x.Refund + x.DiscountMoney), x.PlatformTax,
DueInMoney = x.PreferPrice - (x.Income - x.Refund + x.PlatformTax + x.DiscountMoney),
x.OrderState, x.OrderState,
OrderStateName = x.OrderState.ToName(), OrderStateName = x.OrderState.ToName(),
x.EnterID, x.EnterID,
...@@ -273,6 +274,47 @@ namespace Edu.WebApi.Controllers.Course ...@@ -273,6 +274,47 @@ namespace Edu.WebApi.Controllers.Course
return orderModule.SetClassOrder(demodel, userInfo); return orderModule.SetClassOrder(demodel, userInfo);
} }
/// <summary>
/// 获取订单详情
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetClassOrderInfo() {
var userInfo = base.UserInfo;
JObject parms = JObject.Parse(RequestParm.Msg.ToString());
int OrderId = parms.GetInt("OrderId", 0);
if (OrderId <= 0)
{
return ApiResult.ParamIsNull();
}
var model = orderModule.GetClassOrderInfo(OrderId);
if (model == null) {
return ApiResult.Failed("订单不存在");
}
var list = orderModule.GetClassOrderSetpPrice(OrderId);
return ApiResult.Success("", new
{
OrderInfo = new
{
model.OrderId,
model.GuestNum,
model.Class_Price,
model.Unit_Price,
model.PreferPrice,
model.OrderSource,
OrderSourceName = model.OrderSource.ToName(),
model.SaleRemark
},
StepPriceList = list.Select(x => new
{
x.Id,
x.PersionNum,
x.PersionPrice
})
});
}
/// <summary> /// <summary>
/// 取消订单 /// 取消订单
/// </summary> /// </summary>
...@@ -544,8 +586,23 @@ namespace Edu.WebApi.Controllers.Course ...@@ -544,8 +586,23 @@ namespace Edu.WebApi.Controllers.Course
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public ApiResult SetClassOrderUseNewPrice() { public ApiResult SetClassOrderUseNewClassPrice()
return ApiResult.Success(); {
var userInfo = base.UserInfo;
JObject parms = JObject.Parse(RequestParm.Msg.ToString());
int OrderId = parms.GetInt("OrderId", 0);
if (OrderId <= 0) {
return ApiResult.ParamIsNull();
}
bool flag = orderModule.SetClassOrderUseNewClassPrice(OrderId, userInfo);
if (flag)
{
return ApiResult.Success();
}
else {
return ApiResult.Failed();
}
} }
#endregion #endregion
...@@ -602,7 +659,9 @@ namespace Edu.WebApi.Controllers.Course ...@@ -602,7 +659,9 @@ namespace Edu.WebApi.Controllers.Course
if (string.IsNullOrEmpty(dmodel.GuestName)) { if (string.IsNullOrEmpty(dmodel.GuestName)) {
return ApiResult.ParamIsNull("请输入客人姓名"); return ApiResult.ParamIsNull("请输入客人姓名");
} }
if (string.IsNullOrEmpty(dmodel.Mobile)) {
return ApiResult.ParamIsNull("请输入手机号码");
}
dmodel.GuestState = 1; dmodel.GuestState = 1;
dmodel.Status = 0; dmodel.Status = 0;
...@@ -690,7 +749,8 @@ namespace Edu.WebApi.Controllers.Course ...@@ -690,7 +749,8 @@ namespace Edu.WebApi.Controllers.Course
x.Income, x.Income,
x.Refund, x.Refund,
x.DiscountMoney, x.DiscountMoney,
DueInMoney = x.PreferPrice - (x.Income - x.Refund + x.DiscountMoney), x.PlatformTax,
DueInMoney = x.PreferPrice - (x.Income - x.Refund + x.PlatformTax + x.DiscountMoney),
x.OrderState, x.OrderState,
OrderStateName = x.OrderState.ToName(), OrderStateName = x.OrderState.ToName(),
x.EnterID, x.EnterID,
......
Edu.WebApi/Controllers/Third/ThirdController.cs
View file @ e5618a96
...@@ -136,6 +136,7 @@ namespace Edu.WebApi.Controllers.Third ...@@ -136,6 +136,7 @@ namespace Edu.WebApi.Controllers.Third
int EmployeeId = parms.GetInt("EmployeeId", 0); int EmployeeId = parms.GetInt("EmployeeId", 0);
int OrderId = parms.GetInt("OrderId", 0); int OrderId = parms.GetInt("OrderId", 0);
decimal Income = parms.GetDecimal("Income"); decimal Income = parms.GetDecimal("Income");
decimal PlatformTax = parms.GetDecimal("PlatformTax");
decimal Refund = parms.GetDecimal("Refund"); decimal Refund = parms.GetDecimal("Refund");
if (EmployeeId <= 0) if (EmployeeId <= 0)
{ {
...@@ -151,7 +152,7 @@ namespace Edu.WebApi.Controllers.Third ...@@ -151,7 +152,7 @@ namespace Edu.WebApi.Controllers.Third
return ApiResult.ParamIsNull(message: "当前员工编号不存在!"); return ApiResult.ParamIsNull(message: "当前员工编号不存在!");
} }
bool flag = orderModule.UpdateEduOrderIncome(OrderId, Income, Refund, empModel); bool flag = orderModule.UpdateEduOrderIncome(OrderId, Income, PlatformTax, Refund, empModel);
if (flag) if (flag)
{ {
return ApiResult.Success(); return ApiResult.Success();
......
Edu.WebApi/Controllers/User/UserController.cs
View file @ e5618a96
...@@ -6,6 +6,7 @@ using Edu.Cache.User; ...@@ -6,6 +6,7 @@ using Edu.Cache.User;
using Edu.Common.API; using Edu.Common.API;
using Edu.Common.Enum.User; using Edu.Common.Enum.User;
using Edu.Common.Plugin; using Edu.Common.Plugin;
using Edu.Model.ViewModel.Log;
using Edu.Model.ViewModel.User; using Edu.Model.ViewModel.User;
using Edu.Module.Log; using Edu.Module.Log;
using Edu.Module.User; using Edu.Module.User;
...@@ -822,7 +823,45 @@ namespace Edu.WebApi.Controllers.User ...@@ -822,7 +823,45 @@ namespace Edu.WebApi.Controllers.User
var AccountId = base.ParmJObj.GetInt("AccountId", 0); var AccountId = base.ParmJObj.GetInt("AccountId", 0);
var AccountType = base.ParmJObj.GetInt("AccountType", 0); var AccountType = base.ParmJObj.GetInt("AccountType", 0);
var extModel = employeeModule.GetEmployeeModule(Id, AccountId, AccountType); var extModel = employeeModule.GetEmployeeModule(Id, AccountId, AccountType);
return ApiResult.Success(data: extModel); var obj = new
{
Account = extModel?.Account ?? "",
AccountId = extModel?.AccountId ?? 0,
AccountRemark = extModel?.AccountRemark ?? "",
AccountType = extModel?.AccountType ?? 0,
AccountTypeStr = (extModel?.AccountType ?? 0).ToName(),
Address = extModel?.Address ?? "",
AnnualLeaveDay = extModel?.AnnualLeaveDay ?? 0,
extModel?.BirthDate,
BirthDateStr = (extModel?.BirthDate != null ? Convert.ToDateTime(extModel.BirthDate).ToString("MM-dd") : ""),
CreateBy = extModel?.CreateBy ?? 0,
CreateTime = extModel?.CreateTime,
DeptName = extModel?.DeptName ?? "",
DeptTier = extModel?.DeptTier ?? 0,
Dept_Id = extModel?.Dept_Id ?? 0,
Education = extModel?.Education ?? 0,
EducationStr = (extModel?.Education ?? 0).ToName(),
EmployeeName = extModel?.EmployeeName ?? "",
EmployeeTel = extModel?.EmployeeTel ?? "",
EntryTime =Common.ConvertHelper.FormatDate((extModel?.EntryTime)),
GroupName = extModel?.GroupName ?? "",
Group_Id = extModel?.Group_Id ?? 0,
IDCard = extModel?.IDCard ?? "",
Id = extModel?.Id ?? 0,
IsBirth = extModel?.IsBirth ?? 0,
LeaveStatus = extModel?.LeaveStatus ?? 0,
LeaveStatusStr = (extModel?.LeaveStatus ?? 0).ToName(),
LeaveTime = extModel?.LeaveTime,
PostName = extModel?.PostName,
Post_Id = extModel?.Post_Id ?? 0,
SchoolName = extModel?.SchoolName ?? "",
School_Id = extModel?.School_Id ?? 0,
Sex = extModel?.Sex ?? 0,
SexStr = (extModel?.Sex ?? 0) == 0 ? "男" : "女",
UserIcon = extModel?.UserIcon ?? "",
Status = extModel?.Status ?? 0,
};
return ApiResult.Success(data: obj);
} }
/// <summary> /// <summary>
...@@ -858,11 +897,8 @@ namespace Edu.WebApi.Controllers.User ...@@ -858,11 +897,8 @@ namespace Edu.WebApi.Controllers.User
[HttpPost] [HttpPost]
public ApiResult GetAccountRemarkTypeEnumList() public ApiResult GetAccountRemarkTypeEnumList()
{ {
int type = base.ParmJObj.GetInt("Type", 0);
var list = EnumHelper.EnumToList(typeof(RemarkTypeEnum)); var list = EnumHelper.EnumToList(typeof(RemarkTypeEnum));
return ApiResult.Success("", list); return ApiResult.Success("", list);
} }
/// <summary> /// <summary>
...@@ -1306,5 +1342,25 @@ namespace Edu.WebApi.Controllers.User ...@@ -1306,5 +1342,25 @@ namespace Edu.WebApi.Controllers.User
return ApiResult.Success(data: list); return ApiResult.Success(data: list);
} }
#endregion #endregion
#region 获取用户修改日志
/// <summary>
/// 获取岗位列表
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetEmpChangeLog()
{
var query = new RB_User_ChangeLog_ViewModel()
{
AccountType = (AccountTypeEnum)base.ParmJObj.GetInt("AccountType"),
SourceId = base.ParmJObj.GetInt("AccountId"),
};
query.Group_Id = base.UserInfo.Group_Id;
var list = userChangeLogModule.GetUserChangeLogListModule(query);
return ApiResult.Success(data: list);
}
#endregion
} }
} }
\ No newline at end of file
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