Skip to content

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

页面修改

parent 4e1065d4
Hide whitespace changes
Inline Side-by-side
Showing with 46 additions and 43 deletions
Edu.Module.Course/ClassModule.cs
View file @ 919adfe6
......@@ -2077,7 +2077,7 @@ namespace Edu.Module.Course
var sellerInfo = UserReidsCache.GetUserLoginInfo(orderModel.EnterID);
#region 欠费提醒（销售）
var queryTargetWorkId = accountRepository.GetWorkUserIdRepository(orderModel.EnterID);
if (!string.IsNullOrEmpty(queryTargetWorkId))
if (!string.IsNullOrEmpty(queryTargetWorkId)&& sellerInfo!=null )
{
// 学员名称（名称+电话），剩余课时，关联单号，待收金额，班级老师，班级名称
var path = $"/sale/myOrder?OrderId={guestModel.OrderId}";
......@@ -2135,10 +2135,11 @@ namespace Edu.Module.Course
{
var shengyuMoney = orderModel.PreferPrice - orderModel.Income + orderModel.Refund - orderModel.PlatformTax - orderModel.DiscountMoney - orderModel.LessPrice;
var classModel = classRepository.GetEntity<RB_Class_ViewModel>(guestModel.ClassId);
var sellerInfo = UserReidsCache.GetUserLoginInfo(orderModel.EnterID);
var sellerInfo = UserReidsCache.GetUserLoginInfo(orderModel.CreateBy);
#region 即将欠费提醒（销售）
var queryTargetWorkId = accountRepository.GetWorkUserIdRepository(orderModel.EnterID);
if (!string.IsNullOrEmpty(queryTargetWorkId))
var queryTargetWorkId = accountRepository.GetWorkUserIdRepository(orderModel.CreateBy);
if (!string.IsNullOrEmpty(queryTargetWorkId)&& sellerInfo!=null)
{
// 学员名称（名称+电话），剩余课时，关联单号，待收金额，班级老师，班级名称
var path = $"/sale/myOrder?OrderId={guestModel.OrderId}";
......@@ -2198,7 +2199,7 @@ namespace Edu.Module.Course
var sellerInfo = UserReidsCache.GetUserLoginInfo(orderModel.EnterID);
#region 即将结课提醒 (销售端)
var queryTargetWorkId = accountRepository.GetWorkUserIdRepository(orderModel.EnterID);
if (!string.IsNullOrEmpty(queryTargetWorkId))
if (!string.IsNullOrEmpty(queryTargetWorkId)&&sellerInfo!=null)
{
// 学员名称（名称+电话），剩余课时，关联单号，待收金额，班级老师，班级名称
var path = $"/sale/myOrder?OrderId={guestModel.OrderId}";
......@@ -2261,7 +2262,7 @@ namespace Edu.Module.Course
var sellerInfo = UserReidsCache.GetUserLoginInfo(orderModel.EnterID);
#region 即将结课提醒 (销售端)
var queryTargetWorkId = accountRepository.GetWorkUserIdRepository(orderModel.EnterID);
if (!string.IsNullOrEmpty(queryTargetWorkId))
if (!string.IsNullOrEmpty(queryTargetWorkId)&& sellerInfo!=null)
{
// 学员名称（名称+电话），剩余课时，关联单号，待收金额，班级老师，班级名称
var path = $"/sale/myOrder?OrderId={guestModel.OrderId}";
......@@ -5289,7 +5290,8 @@ namespace Edu.Module.Course
//约课
planModel = class_PlanRepository.GetToDayClassPlanForYK(stuId, courseId, groupId);
}
else {
else
{
planModel = class_PlanRepository.GetToDayClassPlan(classId, groupId);
}
if (planModel != null)
......@@ -5300,7 +5302,8 @@ namespace Edu.Module.Course
var ogModel = order_GuestRepository.GetEntity(guestId);
zj = ogModel.CourseChapterNo + 1;//这次课的章节
}
else {
else
{
zj = planModel.LessonPlanNum + 1;
}
if (planModel.ClassDate.ToString("yyyy-MM-dd") == DateTime.Now.ToString("yyyy-MM-dd"))
......
Edu.WebApi/Controllers/Applet/AppletIndexController.cs
View file @ 919adfe6
......@@ -65,7 +65,7 @@ namespace Edu.WebApi.Controllers.Applet
/// <summary>
/// 课程单词学习、测试处理类对象
/// </summary>
private readonly CourseExamModule courseExamModule = new CourseExamModule();
private readonly CourseExamModule courseExamModule = new CourseExamModule();
/// <summary>
/// 订单仓处理类对象
......@@ -158,7 +158,7 @@ namespace Edu.WebApi.Controllers.Applet
#region 获取最新一条上课反馈记录
List<RB_Class_FeedBack_ViewModel> feedBackList = classModule.GetClassFeedBackPageListRepository(1, 1, out long count, new RB_Class_FeedBack_ViewModel { StuId = appletUserInfo.AccountId, Group_Id = appletUserInfo.Group_Id });
if (feedBackList != null && feedBackList.Any())
{
......@@ -212,7 +212,8 @@ namespace Edu.WebApi.Controllers.Applet
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetIndexInfo_V2() {
public ApiResult GetIndexInfo_V2()
{
var appletUserInfo = base.AppletUserInfo;
//判断学员是否退学
var studentList = studentModule.GetStudentInfo(appletUserInfo.AccountId, appletUserInfo.Group_Id);
......@@ -236,7 +237,8 @@ namespace Edu.WebApi.Controllers.Applet
//查询下一节课(要查询正在学习中)
var ClassNext = new object();
if ((studentModel.ClassId > 0 && studentModel.ClassStatus != 3)|| studentModel.ClassScrollType == 2) {
if ((studentModel.ClassId > 0 && studentModel.ClassStatus != 3) || studentModel.ClassScrollType == 2)
{
List<RB_Class_Time_Extend> classTimeList = new List<RB_Class_Time_Extend>();
if (studentModel.ClassScrollType == 2)
{
......@@ -271,7 +273,8 @@ namespace Edu.WebApi.Controllers.Applet
classModel.ClassName
};
}
else {
else
{
ClassNext = new
{
ClassPlanState = 3//暂无下一节课
......@@ -281,7 +284,8 @@ namespace Edu.WebApi.Controllers.Applet
//查询学习园地
var LearningGardenList = new List<object>();
var enumlist = EnumHelper.EnumToList(typeof(Common.Enum.Course.LearningGardenTypeEnum));
foreach (var item in enumlist) {
foreach (var item in enumlist)
{
var query = new RB_LearningGarden_ViewModel()
{
Group_Id = base.AppletUserInfo.Group_Id,
......@@ -302,7 +306,7 @@ namespace Edu.WebApi.Controllers.Applet
qitem.Id,
qitem.Title,
qitem.Content,
qitem.Img,
qitem.Img,
qitem.Digest,
qitem.LinkUrl,
CreateByName,
......@@ -324,20 +328,21 @@ namespace Edu.WebApi.Controllers.Applet
{
Words = classModule.GetIndexWords(studentModel.ClassId, studentModel.CourseId, studentModel.GuestId, studentModel.ClassScrollType, studentModel.StuId, appletUserInfo.Group_Id);
}
else
else
{
Words = new
{
NextWord = 0,
ReviewWord = 0,
NextCourseNo=0,
ReviewCourseNo=0,
CourseId=0,
ClassId=0,
NextCourseNo = 0,
ReviewCourseNo = 0,
CourseId = 0,
ClassId = 0,
};
}
return ApiResult.Success("", new {
return ApiResult.Success("", new
{
studentModel.GuestId,
studentModel.SName,//学区
studentModel.SurplusHours,//剩余课时
......@@ -359,7 +364,8 @@ namespace Edu.WebApi.Controllers.Applet
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetStudyCourse() {
public ApiResult GetStudyCourse()
{
var appletUserInfo = base.AppletUserInfo;
//判断学员是否退学
var studentList = studentModule.GetStudentInfo(appletUserInfo.AccountId, appletUserInfo.Group_Id);
......@@ -380,7 +386,6 @@ namespace Edu.WebApi.Controllers.Applet
studentModel = studentList.Where(x => x.ClassStatus == 3).FirstOrDefault();
}
}
var result = new
{
studentModel.GuestId,
......@@ -403,7 +408,8 @@ namespace Edu.WebApi.Controllers.Applet
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetMyStudyCourseList() {
public ApiResult GetMyStudyCourseList()
{
var appletUserInfo = base.AppletUserInfo;
//获取学生所有的课程
var studentList = studentModule.GetStudentInfo(appletUserInfo.AccountId, appletUserInfo.Group_Id);
......@@ -433,7 +439,7 @@ namespace Edu.WebApi.Controllers.Applet
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetMyStudyCourseInfo()
public ApiResult GetMyStudyCourseInfo()
{
var appletUserInfo = base.AppletUserInfo;
JObject parms = JObject.Parse(base.RequestParm.Msg.ToString());
......@@ -442,11 +448,11 @@ namespace Edu.WebApi.Controllers.Applet
int GuestId = parms.GetInt("GuestId", 0);//订单GuestId
int ClassScrollType = parms.GetInt("ClassScrollType", 0);//学习类型 1跟班 2约课
int StuId = parms.GetInt("StuId", 0);//学生ID
if (ClassId <= 0)
if (ClassId <= 0)
{
return ApiResult.ParamIsNull("请传递班级ID");
}
if (ClassScrollType == 2 )
if (ClassScrollType == 2)
{
StuId = appletUserInfo.AccountId;
}
......@@ -502,9 +508,9 @@ namespace Edu.WebApi.Controllers.Applet
Words = new
{
NextWord = 0,
NextCourseNo=0,
NextCourseNo = 0,
ReviewWord = 0,
ReviewCourseNo=0,
ReviewCourseNo = 0,
CourseId,
ClassId,
};
......@@ -552,7 +558,7 @@ namespace Edu.WebApi.Controllers.Applet
{
return ApiResult.ParamIsNull("请传递班级ID");
}
if (CourseId <= 0)
if (CourseId <= 0)
{
return ApiResult.ParamIsNull("请传递课程ID");
}
......@@ -563,7 +569,7 @@ namespace Edu.WebApi.Controllers.Applet
var MaxChapterNo = planList.Any() ? planList.Max(x => x.LessonPlanNum) : 0;
//查询所有的章节
var chapterTreeList = courseModule.GetChapterTreeListModule_V2(new Model.ViewModel.Course.RB_Course_Chapter_ViewModel() { Group_Id = appletUserInfo.Group_Id, CourseId = CourseId });
var ctList = chapterTreeList.Where(x => Convert.ToInt32(x.ChapterNo) <= MaxChapterNo).OrderByDescending(qitem=> Convert.ToInt32(qitem.ChapterNo)).ToList();
var ctList = chapterTreeList.Where(x => Convert.ToInt32(x.ChapterNo) <= MaxChapterNo).OrderByDescending(qitem => Convert.ToInt32(qitem.ChapterNo)).ToList();
//章节单词得分
var prepWordsList = courseExamModule.GetStuWordsPrepListModule(new RB_StuWords_Prep_Extend()
{
......@@ -575,8 +581,8 @@ namespace Edu.WebApi.Controllers.Applet
var wordsExamList = courseExamModule.GetStuWordsExamListModule(new RB_StuWords_Exam_Extend()
{
ClassId = ClassId,
CourseId=CourseId,
Stu_Account_Id= appletUserInfo.Id
CourseId = CourseId,
Stu_Account_Id = appletUserInfo.Id
});
//组装数据
var RList = new List<object>();
......@@ -591,7 +597,7 @@ namespace Edu.WebApi.Controllers.Applet
StudyProgress = (int)(Convert.ToDecimal(tempPrepWords.StudyNum) / Convert.ToDecimal(tempPrepWords.TotalNum) * 100);
}
int Num = 1;
decimal Score = 0;//单词测试得分
if (wordsExamList != null && wordsExamList.Count > 0)
{
......@@ -763,7 +769,6 @@ namespace Edu.WebApi.Controllers.Applet
#endregion
#region 我的课程
/// <summary>
/// 获取章节树形列表
......@@ -786,7 +791,6 @@ namespace Edu.WebApi.Controllers.Applet
}
#endregion
#region 我的合同
public ApiResult GetContractList()
{
......@@ -922,7 +926,6 @@ namespace Edu.WebApi.Controllers.Applet
}
#endregion
#region 我的请假列表
/// <summary>
/// 获取请假单据分页列表
......@@ -985,7 +988,6 @@ namespace Edu.WebApi.Controllers.Applet
}
#endregion
#region 我的考卷列表
/// <summary>
/// 获取考卷列表分页列表
......@@ -1207,7 +1209,6 @@ namespace Edu.WebApi.Controllers.Applet
#endregion
#region 学习园地
/// <summary>
......@@ -1289,7 +1290,6 @@ namespace Edu.WebApi.Controllers.Applet
}
#endregion
#region 上课反馈记录
/// <summary>
/// 获取学习园地分页
......@@ -1348,7 +1348,7 @@ namespace Edu.WebApi.Controllers.Applet
var query = new RB_Student_OrderGuest_ViewModel()
{
Account_Id = base.AppletUserInfo.Id,
OrderType=(OrderTypeEnum)base.ParmJObj.GetInt("OrderType")
OrderType = (OrderTypeEnum)base.ParmJObj.GetInt("OrderType")
};
var data = customerStudentModule.GetStuOrderGuestPageModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
List<object> list = new List<object>();
......@@ -1365,7 +1365,7 @@ namespace Edu.WebApi.Controllers.Applet
item.GuestName,
item.CourseName,
item.OrderState,
OrderStateName=item.OrderState.ToName(),
OrderStateName = item.OrderState.ToName(),
item.ClassScrollType
});
}
......@@ -1376,4 +1376,4 @@ namespace Edu.WebApi.Controllers.Applet
#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