Skip to content

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

页面修改

parent b23de20a
Show whitespace changes
Inline Side-by-side
Showing with 124 additions and 10 deletions
Edu.Model/ViewModel/Sell/RB_Order_ViewModel.cs
View file @ d619a18d
using Edu.Common.Enum.Course; using Edu.Common.Enum.Course;
using Edu.Common.Enum.User;
using Edu.Common.Plugin; using Edu.Common.Plugin;
using Edu.Model.Entity.Sell; using Edu.Model.Entity.Sell;
using Edu.Model.ViewModel.Contract; using Edu.Model.ViewModel.Contract;
...@@ -319,5 +320,15 @@ namespace Edu.Model.ViewModel.Sell ...@@ -319,5 +320,15 @@ namespace Edu.Model.ViewModel.Sell
/// 开班类型 1正常班 2滚动班 /// 开班类型 1正常班 2滚动班
/// </summary> /// </summary>
public int ClassScrollType { get; set; } public int ClassScrollType { get; set; }
/// <summary>
/// 客户来源见枚举(学生)
/// </summary>
public StuCreateTypeEnum CreateType { get; set; }
/// <summary>
/// 来源名称
/// </summary>
public string StuSourceIdName { get; set; }
} }
} }
\ No newline at end of file
Edu.Model/ViewModel/User/RB_Student_ViewModel.cs
View file @ d619a18d
...@@ -364,5 +364,15 @@ namespace Edu.Model.ViewModel.User ...@@ -364,5 +364,15 @@ namespace Edu.Model.ViewModel.User
/// 查询时间类型(1-本周,2-上周,3-本月,4-上月) /// 查询时间类型(1-本周,2-上周,3-本月,4-上月)
/// </summary> /// </summary>
public int QTimeType { get; set; } public int QTimeType { get; set; }
/// <summary>
///查询订单编号【查询使用】
/// </summary>
public string QOrderIds { get; set; }
/// <summary>
/// 订单编号
/// </summary>
public int OrderId { get; set; }
} }
} }
\ No newline at end of file
Edu.Module.Course/OrderModule.cs
View file @ d619a18d
using Edu.AOP.CustomerAttribute; using Edu.AOP.CustomerAttribute;
using Edu.Cache.User; using Edu.Cache.User;
using Edu.Common; using Edu.Common;
using Edu.Common.API;
using Edu.Common.Enum; using Edu.Common.Enum;
using Edu.Common.Enum.Course; using Edu.Common.Enum.Course;
using Edu.Common.Enum.Sale; using Edu.Common.Enum.Sale;
...@@ -10,7 +9,6 @@ using Edu.Common.Enum.User; ...@@ -10,7 +9,6 @@ using Edu.Common.Enum.User;
using Edu.Common.Plugin; using Edu.Common.Plugin;
using Edu.Model.CacheModel; using Edu.Model.CacheModel;
using Edu.Model.Entity.Contract; using Edu.Model.Entity.Contract;
using Edu.Model.Entity.Course;
using Edu.Model.Entity.Sell; using Edu.Model.Entity.Sell;
using Edu.Model.ViewModel.Contract; using Edu.Model.ViewModel.Contract;
using Edu.Model.ViewModel.Course; using Edu.Model.ViewModel.Course;
...@@ -26,7 +24,6 @@ using Edu.Model.ViewModel.User; ...@@ -26,7 +24,6 @@ using Edu.Model.ViewModel.User;
using Edu.Repository.Contract; using Edu.Repository.Contract;
using Edu.Repository.Course; using Edu.Repository.Course;
using Edu.Repository.Customer; using Edu.Repository.Customer;
using Edu.Repository.EduTask;
using Edu.Repository.Finance; using Edu.Repository.Finance;
using Edu.Repository.Grade; using Edu.Repository.Grade;
using Edu.Repository.Log; using Edu.Repository.Log;
...@@ -3239,6 +3236,9 @@ namespace Edu.Module.Course ...@@ -3239,6 +3236,9 @@ namespace Edu.Module.Course
if (orderList.Any()) if (orderList.Any())
{ {
string orderIds = string.Join(",", orderList.Select(x => x.OrderId)); string orderIds = string.Join(",", orderList.Select(x => x.OrderId));
//学员信息
List<RB_Student_ViewModel> stuList = studentRepository.GetStudentListRepository(new RB_Student_ViewModel() { QOrderIds = orderIds },isQueryCreateType:true);
List<int> idList = new List<int>(); List<int> idList = new List<int>();
List<RB_Order_ViewModel> sourceTargetList = new List<RB_Order_ViewModel>(); List<RB_Order_ViewModel> sourceTargetList = new List<RB_Order_ViewModel>();
var sourceOrderIdList = Common.ConvertHelper.StringToList(string.Join(",", orderList.Select(x => x.SourceOrderId))); var sourceOrderIdList = Common.ConvertHelper.StringToList(string.Join(",", orderList.Select(x => x.SourceOrderId)));
...@@ -3326,6 +3326,10 @@ namespace Edu.Module.Course ...@@ -3326,6 +3326,10 @@ namespace Edu.Module.Course
subItem.ContractStatusStr = ContractStatusStr; subItem.ContractStatusStr = ContractStatusStr;
} }
} }
var tempStu = stuList?.FirstOrDefault(qitem => qitem.OrderId == item.OrderId);
item.CreateType = tempStu?.CreateType ?? StuCreateTypeEnum.EmployeeInput;
item.StuSourceIdName = tempStu?.StuSourceIdName ?? "";
} }
} }
return orderList; return orderList;
......
Edu.Repository/Sell/RB_OrderRepository.cs
View file @ d619a18d
...@@ -291,7 +291,7 @@ FROM RB_Order o LEFT JOIN rb_class c on o.ClassId = c.ClassId ...@@ -291,7 +291,7 @@ FROM RB_Order o LEFT JOIN rb_class c on o.ClassId = c.ClassId
LEFT JOIN rb_course AS course ON (o.CourseId=course.CourseId AND o.CourseId>0 AND o.OrderType=1) LEFT JOIN rb_course AS course ON (o.CourseId=course.CourseId AND o.CourseId>0 AND o.OrderType=1)
LEFT JOIN rb_course_subject AS csubject ON course.CourseSubject=csubject.Id LEFT JOIN rb_course_subject AS csubject ON course.CourseSubject=csubject.Id
LEFT JOIN rb_school AS school ON c.School_Id=school.SId LEFT JOIN rb_school AS school ON c.School_Id=school.SId
left join rb_customer cu on cu.CustomerId = o.CustomerId LEFT JOIN rb_customer cu on cu.CustomerId = o.CustomerId
WHERE {where} ORDER BY {orderBy} WHERE {where} ORDER BY {orderBy}
"; ";
return GetPage<RB_Order_ViewModel>(pageIndex, pageSize, out rowsCount, sql).ToList(); return GetPage<RB_Order_ViewModel>(pageIndex, pageSize, out rowsCount, sql).ToList();
......
Edu.Repository/User/RB_StudentRepository.cs
View file @ d619a18d
using Edu.Common.Enum; using Edu.Common.Enum;
using Edu.Common.Enum.User;
using Edu.Common.Plugin; using Edu.Common.Plugin;
using Edu.Model.Entity.User; using Edu.Model.Entity.User;
using Edu.Model.ViewModel.Customer;
using Edu.Model.ViewModel.User; using Edu.Model.ViewModel.User;
using Edu.Repository.Customer; using Edu.Repository.Customer;
using Edu.Repository.System; using Edu.Repository.System;
...@@ -63,16 +65,30 @@ namespace Edu.Repository.User ...@@ -63,16 +65,30 @@ namespace Edu.Repository.User
/// </summary> /// </summary>
/// <param name="query"></param> /// <param name="query"></param>
/// <returns></returns> /// <returns></returns>
public List<RB_Student_ViewModel> GetStudentListRepository(RB_Student_ViewModel query) public List<RB_Student_ViewModel> GetStudentListRepository(RB_Student_ViewModel query,bool isQueryCreateType=false)
{ {
var parameters = new DynamicParameters(); var parameters = new DynamicParameters();
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
if (isQueryCreateType && !string.IsNullOrEmpty(query.QOrderIds))
{
builder.AppendFormat(@"
SELECT t.*,g.GroupName,s.SName,stuog.OrderId
FROM rb_student AS t LEFT JOIN rb_group AS g ON t.Group_Id=g.GId
LEFT JOIN rb_school AS s ON t.School_Id=s.SId
LEFT JOIN rb_student_orderguest AS stuog ON t.StuId=stuog.Student_Id
WHERE 1=1
");
}
else
{
builder.AppendFormat(@" builder.AppendFormat(@"
SELECT t.*,g.GroupName,s.SName SELECT t.*,g.GroupName,s.SName
FROM rb_student AS t LEFT JOIN rb_group AS g ON t.Group_Id=g.GId FROM rb_student AS t LEFT JOIN rb_group AS g ON t.Group_Id=g.GId
LEFT JOIN rb_school AS s ON t.School_Id=s.SId LEFT JOIN rb_school AS s ON t.School_Id=s.SId
WHERE 1=1 WHERE 1=1
"); ");
}
builder.AppendFormat(" AND t.{0}={1} ", nameof(RB_Student_ViewModel.Status), (int)DateStateEnum.Normal); builder.AppendFormat(" AND t.{0}={1} ", nameof(RB_Student_ViewModel.Status), (int)DateStateEnum.Normal);
if (query != null) if (query != null)
{ {
...@@ -122,8 +138,72 @@ WHERE 1=1 ...@@ -122,8 +138,72 @@ WHERE 1=1
{ {
builder.AppendFormat(" AND t.{0}={1} ", nameof(RB_Student_ViewModel.CreateBy), query.CreateBy); builder.AppendFormat(" AND t.{0}={1} ", nameof(RB_Student_ViewModel.CreateBy), query.CreateBy);
} }
//根据订单编号查询学员
if (!string.IsNullOrEmpty(query.QOrderIds))
{
builder.AppendFormat(" AND stuog.OrderId IN({0}) ", query.QOrderIds);
} }
return Get<RB_Student_ViewModel>(builder.ToString(), parameters).ToList(); }
var stuList = Get<RB_Student_ViewModel>(builder.ToString(), parameters).ToList();
if (isQueryCreateType)
{
//转介人列表
List<RB_Student_ViewModel> transStudentList = new List<RB_Student_ViewModel>();
//同业录入列表
List<RB_Customer_Extend> customerList = new List<RB_Customer_Extend>();
//内部介绍人
List<RB_Account_ViewModel> accountList = new List<RB_Account_ViewModel>();
if (stuList != null && stuList.Count > 0)
{
List<int> customerIdList = Common.ConvertHelper.StringToList(string.Join(",", stuList.Where(qitem => qitem.CreateType == StuCreateTypeEnum.CustomerInput).Select(qitem => qitem.StuSourceId)));
if (customerIdList != null && customerIdList.Count > 0)
{
customerList = customerRepository.GetCustomerListRepository(new RB_Customer_Extend()
{
CustomerIds = string.Join(",", customerIdList)
});
}
List<int> transIdList = Common.ConvertHelper.StringToList(string.Join(",", stuList.Where(qitem => qitem.CreateType == StuCreateTypeEnum.TransIntroduction).Select(qitem => qitem.StuSourceId)));
if (transIdList != null && transIdList.Count > 0)
{
transStudentList = GetStudentListRepository(new RB_Student_ViewModel()
{
StuIds = string.Join(",", transIdList)
});
}
List<int> empIdList = Common.ConvertHelper.StringToList(string.Join(",", stuList.Where(qitem => qitem.CreateType == StuCreateTypeEnum.InternalIntroduction).Select(qitem => qitem.StuSourceId)));
if (empIdList != null && empIdList.Count > 0)
{
accountList = accountRepository.GetAccountListExtRepository(new RB_Account_ViewModel() { QIds = string.Join(",", empIdList) });
}
foreach (var item in stuList)
{
if (item.CreateType == StuCreateTypeEnum.InternalIntroduction)
{
item.StuSourceIdName = accountList?.FirstOrDefault(qitem => qitem.Id == item.StuSourceId)?.AccountName ?? "";
}
else if (item.CreateType == StuCreateTypeEnum.CustomerInput)
{
var tempCustomer = customerList?.FirstOrDefault(qitem => qitem.CustomerId == item.StuSourceId);
var tempStr = (tempCustomer?.CustomerName ?? "");
if ((tempCustomer?.EnterpriseName ?? "") != "")
{
tempStr += "(" + (tempCustomer?.EnterpriseName ?? "") + ")";
}
item.StuSourceIdName = tempStr ;
}
else if (item.CreateType == StuCreateTypeEnum.TransIntroduction)
{
item.StuSourceIdName = transStudentList?.FirstOrDefault(qitem => qitem.StuId == item.StuSourceId)?.StuName ?? "";
}
}
}
}
return stuList;
} }
/// <summary> /// <summary>
......
Edu.WebApi/Controllers/B2BApp/B2BAppController.cs
View file @ d619a18d
...@@ -108,6 +108,9 @@ namespace Edu.WebApi.Controllers.B2BApp ...@@ -108,6 +108,9 @@ namespace Edu.WebApi.Controllers.B2BApp
item.OrderId, item.OrderId,
TotalHours=gModel?.TotalHours??0, TotalHours=gModel?.TotalHours??0,
CompleteHours=gModel?.CompleteHours??0, CompleteHours=gModel?.CompleteHours??0,
item.CreateType,
CreateTypeName= item.CreateType.ToName(),
item.StuSourceIdName,
}); });
} }
pageModel.PageData = result; pageModel.PageData = result;
......
Edu.WebApi/Controllers/Course/OrderController.cs
View file @ d619a18d
...@@ -1507,7 +1507,10 @@ namespace Edu.WebApi.Controllers.Course ...@@ -1507,7 +1507,10 @@ namespace Edu.WebApi.Controllers.Course
z.ContractNo, z.ContractNo,
z.GuestId, z.GuestId,
z.Status z.Status
}) }),
x.CreateType,
CreateTypeName = x.CreateType.ToName(),
x.StuSourceIdName,
}) })
}; };
pageModel.PageData = obj; pageModel.PageData = obj;
...@@ -1700,7 +1703,10 @@ namespace Edu.WebApi.Controllers.Course ...@@ -1700,7 +1703,10 @@ namespace Edu.WebApi.Controllers.Course
z.ContractNo, z.ContractNo,
z.GuestId, z.GuestId,
z.Status, z.Status,
}) }),
x.CreateType,
CreateTypeName = x.CreateType.ToName(),
x.StuSourceIdName,
}) })
}; };
pageModel.PageData = obj; pageModel.PageData = obj;
......
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