Commit 1fb78f46 authored by 黄奎's avatar 黄奎

页面修改

parent b381c550
......@@ -10,6 +10,19 @@ namespace Edu.Model.ViewModel.Customer
/// </summary>
public class RB_Customer_Category_Extend : RB_Customer_Category
{
/// <summary>
/// 联系人数量
/// </summary>
public int LinkManCount { get; set; }
/// <summary>
/// 学员数量
/// </summary>
public int StudentCount { get; set; }
/// <summary>
/// 订单数量
/// </summary>
public int OrderCount { get; set; }
}
}
......@@ -496,6 +496,10 @@ namespace Edu.Module.Customer
public List<RB_Customer_Category_Extend> GetCustomerCategoryPageModule(int pageIndex, int pageSize, out long rowsCount, RB_Customer_Category_Extend query)
{
var list = customer_CategoryRepository.GetCustomerCategoryPageRepository(pageIndex, pageSize, out rowsCount, query);
if (list != null && list.Count > 0)
{
}
return list;
}
......
......@@ -145,7 +145,7 @@ namespace Edu.Module.User
QStuIds = stuIds
});
//学员订单
var stuOrderList = student_OrderGuestRepository.GetStrOrderGuestListRepository(new RB_Student_OrderGuest_ViewModel()
var stuOrderList = student_OrderGuestRepository.GetStrOrderGuestListStaticRepository(new RB_Student_OrderGuest_ViewModel()
{
QStudentIds = stuIds
});
......
......@@ -62,6 +62,61 @@ WHERE 1=1 AND C.OrderState<>3
return Get<RB_Student_OrderGuest_ViewModel>(builder.ToString()).ToList();
}
/// <summary>
/// 获取员工订单旅客关联列表
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_Student_OrderGuest_ViewModel> GetStrOrderGuestListStaticRepository(RB_Student_OrderGuest_ViewModel query)
{
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
SELECT A.*,IFNULL(B.ClassName,'') AS ClassName,IFNULL(B.ClassNo,'') AS ClassNo,IFNULL(C.JoinType,0) AS StuJoinType,IFNULL(D.GuestState,0) AS StuGuestState
,C.OrderState,IFNULL(D.TotalHours,0) AS TotalHours,IFNULL(D.CompleteHours,0) AS CompleteHours,IFNULL(B.ClassStatus,0) AS ClassStatus,IFNULL(D.RenewState,0) AS RenewState
FROM RB_Student_OrderGuest AS A INNER JOIN rb_class AS B ON A.ClassId=B.ClassId
INNER JOIN rb_order AS C ON A.OrderId=C.OrderId
INNER JOIN rb_order_guest AS D ON A.GuestId=D.Id
WHERE 1=1 AND C.OrderState<>3
");
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_OrderGuest_ViewModel.Status), (int)DateStateEnum.Normal);
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_OrderGuest_ViewModel.Status), (int)DateStateEnum.Normal);
if (query != null)
{
if (query.ClassId > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_OrderGuest_ViewModel.ClassId), query.ClassId);
}
if (query.OrderId > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_OrderGuest_ViewModel.OrderId), query.OrderId);
}
if (query.GuestId > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_OrderGuest_ViewModel.GuestId), query.GuestId);
}
if (query.Student_Id > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_OrderGuest_ViewModel.Student_Id), query.Student_Id);
}
if (!string.IsNullOrEmpty(query.QStudentIds))
{
builder.AppendFormat(" AND A.{0} IN({1}) ", nameof(RB_Student_OrderGuest_ViewModel.Student_Id), query.QStudentIds);
}
if (query.Account_Id > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_OrderGuest_ViewModel.Account_Id), query.Account_Id);
}
}
string sql = string.Format(@"
SELECT A.Student_Id,A.OrderId,A.OrderState,A.RenewState FROM
(
{0}
) AS A
GROUP BY A.Student_Id,A.OrderId
",builder.ToString());
return Get<RB_Student_OrderGuest_ViewModel>(sql).ToList();
}
/// <summary>
/// 获取学员关联订单分页列表
......
......@@ -806,6 +806,9 @@ namespace Edu.WebApi.Controllers.Customer
item.CategoryName,
CreateByName,
item.CatetoryType,
item.LinkManCount,
item.StudentCount,
item.OrderCount,
CatetoryTypeName = item.CatetoryType.ToName(),
CreateTime = Common.ConvertHelper.FormatTime(item.CreateTime),
});
......
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