Skip to content

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

页面修改

parent 8a66ee32
Hide whitespace changes
Inline Side-by-side
Showing with 192 additions and 27 deletions
Edu.Model/ViewModel/User/RB_Student_OrderGuest_ViewModel.cs
View file @ 34c16d0f
......@@ -32,6 +32,11 @@ namespace Edu.Model.ViewModel.User
/// </summary>
public string CourseName { get; set; }
/// <summary>
/// 订单类型
/// </summary>
public OrderTypeEnum OrderType { get; set; }
/// <summary>
/// 订单类型
/// </summary>
......@@ -98,5 +103,10 @@ namespace Edu.Model.ViewModel.User
/// 课程ID
/// </summary>
public int CourseId { get; set; }
/// <summary>
/// 留学就业编号
/// </summary>
public int SourceId { get; set; }
}
}
Edu.Module.Course/ClassModule.cs
View file @ 34c16d0f
......@@ -1509,7 +1509,7 @@ namespace Edu.Module.Course
}
list.Add(new
{
IsEndDate = item.ClassDate <= today && item.ClassDate >= today.AddDays(-7),
IsCanSign = item.ClassDate <= today && item.ClassDate >= today.AddDays(-7),
item.ClassPlanId,
item.ClassId,
item.ClassDate,
......@@ -1519,7 +1519,8 @@ namespace Edu.Module.Course
item.TeacherId,
item.TeacherName,
item.UserIcon,
TimeList = classTimeList
TimeList = classTimeList,
IsCanEdit= item.ClassDate>today,
});
}
}
......
Edu.Module.Course/OrderModule.cs
View file @ 34c16d0f
......@@ -2700,34 +2700,45 @@ namespace Edu.Module.Course
if (flag )
{
RB_Student_ViewModel stuModel = null;
if (!string.IsNullOrEmpty(dmodel.Mobile))
if ((dmodel?.StudentId ?? 0) > 0)
{
//学员表
stuModel = studentRepository.GetStuByTelRepository(new RB_Student_ViewModel()
{
Group_Id = dmodel.Group_Id,
StuTel = dmodel.Mobile
StuId= dmodel?.StudentId??0
});
}
if (stuModel == null && !string.IsNullOrEmpty(dmodel.QQ))
else
{
//学员表
stuModel = studentRepository.GetStuByTelRepository(new RB_Student_ViewModel()
if (!string.IsNullOrEmpty(dmodel.Mobile))
{
Group_Id = dmodel.Group_Id,
QQ = dmodel.QQ
});
}
if (stuModel == null && !string.IsNullOrEmpty(dmodel.WeChatNo))
{
//学员表
stuModel = studentRepository.GetStuByTelRepository(new RB_Student_ViewModel()
//学员表
stuModel = studentRepository.GetStuByTelRepository(new RB_Student_ViewModel()
{
Group_Id = dmodel.Group_Id,
StuTel = dmodel.Mobile
});
}
if (stuModel == null && !string.IsNullOrEmpty(dmodel.QQ))
{
Group_Id = dmodel.Group_Id,
WeChatNo = dmodel.WeChatNo
});
//学员表
stuModel = studentRepository.GetStuByTelRepository(new RB_Student_ViewModel()
{
Group_Id = dmodel.Group_Id,
QQ = dmodel.QQ
});
}
if (stuModel == null && !string.IsNullOrEmpty(dmodel.WeChatNo))
{
//学员表
stuModel = studentRepository.GetStuByTelRepository(new RB_Student_ViewModel()
{
Group_Id = dmodel.Group_Id,
WeChatNo = dmodel.WeChatNo
});
}
}
//不存在存在学员基本信息
if (stuModel == null)
{
......@@ -4441,5 +4452,25 @@ namespace Edu.Module.Course
#endregion
/// <summary>
/// 获取学员订单分页列表
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="rowsCount"></param>
/// <param name="StuAccountId"></param>
/// <param name="GroupId"></param>
/// <returns></returns>
public List<RB_Order_ViewModel> GetStudentOrderPageModule(int pageIndex, int pageSize, out long rowsCount, int StuAccountId,int GroupId)
{
var query = new RB_Order_ViewModel()
{
Group_Id= GroupId,
};
var list= OrderPageModule(pageIndex, pageSize, out rowsCount, query);
return list;
}
}
}
\ No newline at end of file
Edu.Module.Course/OrderModule2.cs
View file @ 34c16d0f
......@@ -412,7 +412,8 @@ namespace Edu.Module.Course
{
return "学生选择超出" + (glist.Count() + StuNum - orderModel.GuestNum) + "位";
}
foreach (var item in StuList) {
foreach (var item in StuList)
{
if (glist.Where(x => x.Mobile == item.StuTel).Any()) {
return "学生" + item.StuName + "已录入学生名单中，请核实后再试";
}
......@@ -455,7 +456,8 @@ namespace Edu.Module.Course
CompleteHours = 0,
MakeUpHours = 0,
StuIcon = item.StuIcon,
RenewState = 1
RenewState = 1,
StudentId=item?.StuId??0
};
if (orderModel.OrderType == OrderTypeEnum.CourseOrder)
{
......
Edu.Module.Customer/CustomerStudentModule.cs
View file @ 34c16d0f
......@@ -13,6 +13,8 @@ using Edu.Repository.System;
using Edu.Model.Entity.System;
using Edu.Model.ViewModel.System;
using Edu.Cache.Customer;
using Edu.Repository.StudyAbroad;
using Edu.Model.ViewModel.StudyAbroad;
namespace Edu.Module.Customer
{
......@@ -88,6 +90,11 @@ namespace Edu.Module.Customer
private readonly Rb_dictvalueRepository dictvalueRepository = new Rb_dictvalueRepository();
/// <summary>
/// 留学就业项目仓储层对象
/// </summary>
private readonly RB_StudyAbroadRepository studyAbroadRepository = new RB_StudyAbroadRepository();
#region 学员约访
......@@ -617,6 +624,30 @@ namespace Edu.Module.Customer
public List<RB_Student_OrderGuest_ViewModel> GetStuOrderGuestPageModule(int pageIndex, int pageSize, out long rowsCount, RB_Student_OrderGuest_ViewModel query)
{
var list = student_OrderGuestRepository.GetStuOrderGuestPageRepository(pageIndex, pageSize, out rowsCount, query);
if (list != null && list.Count > 0)
{
var tempList = list?.Where(qitem => qitem.OrderType == Common.Enum.Sale.OrderTypeEnum.StudyabroadOrder && qitem.SourceId > 0)?.ToList();
List<RB_StudyAbroad_ViewModel> studyList = new List<RB_StudyAbroad_ViewModel>();
if (tempList != null)
{
string SourceIds = string.Join(",", tempList.Select(qitem => qitem.SourceId));
if (!string.IsNullOrEmpty(SourceIds))
{
studyList = studyAbroadRepository.GetStudyAbroadListRepository(new RB_StudyAbroad_ViewModel()
{
QIds = SourceIds
});
}
}
foreach (var item in list)
{
if (item.OrderType == Common.Enum.Sale.OrderTypeEnum.StudyabroadOrder && item.SourceId > 0)
{
item.CourseId = item.SourceId;
item.CourseName = studyList?.Where(qitem => qitem.Id == item.SourceId)?.FirstOrDefault()?.Name ?? "";
}
}
}
return list;
}
......
Edu.Repository/User/RB_StudentRepository.cs
View file @ 34c16d0f
......@@ -783,6 +783,10 @@ WHERE 1=1
builder.AppendFormat(" AND t.{0}=@WeChatNo ", nameof(RB_Student_ViewModel.WeChatNo));
parameters.Add("WeChatNo", query.WeChatNo.Trim());
}
if (query.StuId > 0)
{
builder.AppendFormat(" AND t.{0}={1} ", nameof(RB_Student_ViewModel.StuId), query.StuId);
}
}
return Get<RB_Student_ViewModel>(builder.ToString(), parameters)?.FirstOrDefault();
}
......@@ -816,5 +820,43 @@ WHERE 1=1
var list = Get<RB_Student_ViewModel>(builder.ToString()).ToList();
return list;
}
/// <summary>
/// 市场部、课程顾问部、线索统计
/// </summary>
/// <param name="createByIds">线索创建人</param>
/// <param name="startDate">开始时间</param>
/// <param name="endDate">结束时间</param>
/// <param name="StuStage">客户阶段</param>
/// <returns></returns>
public List<RB_Student_ViewModel> GetStudentClueRepository(string createByIds, string startDate, string endDate,int StuStage=0)
{
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
SELECT DATE_FORMAT(CreateTime,'%Y-%m-%d') AS CreateTime,Count(1) AS ClueCount
FROM RB_Student
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);
}
if (StuStage > 0)
{
builder.AppendFormat(" AND StuStage={0} ", StuStage);
}
builder.AppendFormat(" GROUP BY DATE_FORMAT(CreateTime,'%Y-%m-%d') ");
builder.AppendFormat(" ORDER BY DATE_FORMAT(CreateTime,'%Y/%m/%d') ");
var list = Get<RB_Student_ViewModel>(builder.ToString()).ToList();
return list;
}
}
}
\ No newline at end of file
Edu.Repository/User/RB_Student_OrderGuestRepository.cs
View file @ 34c16d0f
......@@ -74,11 +74,11 @@ WHERE 1=1 AND C.OrderState<>3
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
,IFNULL(D.GuestName,'') AS GuestName,IFNULL(E.CourseName,'') AS CourseName
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
,IFNULL(D.GuestName,'') AS GuestName,IFNULL(E.CourseName,'') AS CourseName,IFNULL(C.OrderType,0) AS OrderType,IFNULL(C.SourceId,0) AS SourceId
FROM RB_Student_OrderGuest AS A INNER JOIN rb_order AS C ON A.OrderId=C.OrderId
INNER JOIN rb_order_guest AS D ON A.GuestId=D.Id
INNER JOIN rb_course AS E ON c.CourseId=E.CourseId
LEFT JOIN rb_course AS E ON c.CourseId=E.CourseId
LEFT JOIN rb_class AS B ON A.ClassId=B.ClassId
WHERE 1=1
");
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_OrderGuest_ViewModel.Status), (int)DateStateEnum.Normal);
......@@ -104,7 +104,10 @@ WHERE 1=1
{
builder.AppendFormat(" AND A.{0} IN({1}) ", nameof(RB_Student_OrderGuest_ViewModel.Student_Id), query.QStudentIds);
}
if (query.OrderType > 0)
{
builder.AppendFormat(" AND C.{0}={1} ", nameof(RB_Student_OrderGuest_ViewModel.OrderType), (int)query.OrderType);
}
if (query.Account_Id > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_OrderGuest_ViewModel.Account_Id), query.Account_Id);
......
Edu.WebApi/Controllers/Applet/AppletIndexController.cs
View file @ 34c16d0f
......@@ -7,12 +7,14 @@ using Edu.Common.API;
using Edu.Common.Enum;
using Edu.Common.Enum.Exam;
using Edu.Common.Enum.Question;
using Edu.Common.Enum.Sale;
using Edu.Common.Plugin;
using Edu.Model.ViewModel.Exam;
using Edu.Model.ViewModel.Grade;
using Edu.Model.ViewModel.LearningGarden;
using Edu.Model.ViewModel.User;
using Edu.Module.Course;
using Edu.Module.Customer;
using Edu.Module.EduTask;
using Edu.Module.Exam;
using Edu.Module.Public;
......@@ -65,6 +67,11 @@ namespace Edu.WebApi.Controllers.Applet
/// </summary>
private readonly CourseExamModule courseExamModule = new CourseExamModule();
/// <summary>
/// 订单仓处理类对象
/// </summary>
private readonly CustomerStudentModule customerStudentModule = new CustomerStudentModule();
#region 小程序首页
/// <summary>
......@@ -1269,5 +1276,43 @@ namespace Edu.WebApi.Controllers.Applet
return ApiResult.Success(data: pageModel);
}
#endregion
#region 我的订单
/// <summary>
/// 学员订单分页列表
/// </summary>
/// <returns></returns>
public ApiResult GetOrderPage()
{
var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
var query = new RB_Student_OrderGuest_ViewModel()
{
Account_Id = base.AppletUserInfo.Id,
OrderType=(OrderTypeEnum)base.ParmJObj.GetInt("OrderType")
};
var data = customerStudentModule.GetStuOrderGuestPageModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
List<object> list = new List<object>();
foreach (var item in data)
{
list.Add(new
{
item.OrderId,
item.Student_Id,
item.ClassName,
item.ClassNo,
item.TotalHours,
item.CompleteHours,
item.GuestName,
item.CourseName,
item.OrderState,
OrderStateName=item.OrderState.ToName(),
});
}
pageModel.Count = rowsCount;
pageModel.PageData = list;
return ApiResult.Success(data: pageModel);
}
#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