Skip to content

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

1

parent c8fb1936
Hide whitespace changes
Inline Side-by-side
Showing with 382 additions and 29 deletions
Edu.Model/ViewModel/DataStatistics/StudentFollowStatic.cs
View file @ 6e8e1554
...@@ -48,8 +48,10 @@ namespace Edu.Model.ViewModel.DataStatistics ...@@ -48,8 +48,10 @@ namespace Edu.Model.ViewModel.DataStatistics
/// </summary> /// </summary>
public string StuProfession { get; set; } public string StuProfession { get; set; }
/// <summary>
/// 订单对应的学生信息id
/// </summary>
public int GuestId { get; set; }
/// <summary> /// <summary>
/// 课程名称 /// 课程名称
......
Edu.Model/ViewModel/User/RB_Student_Study_ViewModel.cs
View file @ 6e8e1554
...@@ -8,7 +8,17 @@ namespace Edu.Model.ViewModel.User ...@@ -8,7 +8,17 @@ namespace Edu.Model.ViewModel.User
/// <summary> /// <summary>
/// 学员学习章节、月度总结、考试扩展实体类 /// 学员学习章节、月度总结、考试扩展实体类
/// </summary> /// </summary>
public class RB_Student_Study_ViewModel: RB_Student_Study public class RB_Student_Study_ViewModel : RB_Student_Study
{ {
}
/// <summary>
/// 其他实体
/// </summary>
public class StudyOther
{
public string Name { get; set; }
public decimal Score { get; set; }
} }
} }
Edu.Module.Course/ScrollClassModule.cs
View file @ 6e8e1554
...@@ -117,6 +117,10 @@ namespace Edu.Module.Course ...@@ -117,6 +117,10 @@ namespace Edu.Module.Course
/// 跳课记录 /// 跳课记录
/// </summary> /// </summary>
private readonly RB_Scroll_SkipCourseRepository scroll_SkipCourseRepository = new RB_Scroll_SkipCourseRepository(); private readonly RB_Scroll_SkipCourseRepository scroll_SkipCourseRepository = new RB_Scroll_SkipCourseRepository();
/// <summary>
/// 跳课记录
/// </summary>
private readonly RB_Student_StudyRepository studentStudyRepository = new RB_Student_StudyRepository();
#region 班次 #region 班次
...@@ -3698,8 +3702,203 @@ namespace Edu.Module.Course ...@@ -3698,8 +3702,203 @@ namespace Edu.Module.Course
} }
public bool SetStuStudy(RB_Student_Study_ViewModel model)
{
bool flag = false;
if (model.ID > 0)
{
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{nameof(RB_Student_Study_ViewModel.Words),model.Words },
{nameof(RB_Student_Study_ViewModel.UpdateBy),model.UpdateBy },
{nameof(RB_Student_Study_ViewModel.UpdateTime),model.UpdateTime },
{nameof(RB_Student_Study_ViewModel.Practice),model.Practice },
{nameof(RB_Student_Study_ViewModel.ReadingAloud),model.ReadingAloud },
{nameof(RB_Student_Study_ViewModel.StudyValue),model.StudyValue },
{nameof(RB_Student_Study_ViewModel.Remarks),model.Remarks },
{nameof(RB_Student_Study_ViewModel.Other),model.Other },
};
flag = studentStudyRepository.Update(fileds, new WhereHelper(nameof(RB_Student_Study_ViewModel.ID), model.ID));
}
else
{
flag = studentStudyRepository.Insert(model) > 0;
}
return flag;
}
/// <summary>
/// 获取学员学习情况
/// </summary>
/// <param name="demodel"></param>
/// <returns></returns>
public object GetStuStudyList(RB_Student_ViewModel demodel)
{
List<object> Rlist = new List<object>();
//根据学生 查询所有的约课数据
var AppointList = scroll_AppointmentRepository.GetAppointList(new RB_Scroll_Appointment_ViewModel() { Group_Id = demodel.Group_Id, LearnCourseId = demodel.CourseId, StuId = demodel.StuId });
//查询所有的 补课记录
var SkipList = scroll_SkipCourseRepository.GetList(new RB_Scroll_SkipCourse_ViewModel() { Group_Id = demodel.Group_Id, StuId = demodel.StuId, CourseId = demodel.CourseId });
//根据课程Id 查询 上课课程
var cList = course_ChapterRepository.GetChapterListRepository(new RB_Course_Chapter_ViewModel() { Group_Id = demodel.Group_Id, CourseId = demodel.CourseId });
//获取学员学习情况打分
var studyList = studentStudyRepository.GetStudentStudyListRepository(new RB_Student_Study_ViewModel { CourseId = demodel.CourseId, StuId = demodel.StuId, GuestId = demodel.GuestId });
var courseModel = courseRepository.GetEntity(demodel.CourseId);
if (cList != null && cList.Any())
{
if (demodel.ClassScrollType == 2)
{
var achildList = AppointList?.Where(x => x.GuestId == demodel.GuestId).ToList();//当前课程的
//预约课
cList.ForEach(x =>
{
x.SortNum = Convert.ToDouble(x.ChapterNo);
});
cList.OrderBy(x => x.SortNum).ToList().ForEach(x =>
{
var AppointModel = achildList.Where(y => y.CourseGradeNo == x.SortNum && y.AppointType != 3 && y.LearnCourseId == demodel.CourseId).FirstOrDefault();
var SkipModel = SkipList.Where(y => y.ChapterNo == x.SortNum && y.CourseId == demodel.CourseId).FirstOrDefault();
int AgainNum = achildList.Where(y => y.CourseGradeNo == x.SortNum && y.AppointType == 3 && y.LearnCourseId == demodel.CourseId).Count();
int State = 3;
int AppointState = 0;
string ClassDate = "";
var studentStudyModel = studyList?.FirstOrDefault(z => z.ChapterId == x.ChapterId && z.StudyType == 1);
if (AppointModel != null)
{
ClassDate = AppointModel.Date.ToString("yyyy-MM-dd");
//正常约课
if (AppointModel.AppointType == 1)
{
State = 1;//正常上课
}
else if (AppointModel.AppointType == 2)
{
State = 2;//补课
}
AppointState = (int)AppointModel.State;
}
if (SkipModel != null && SkipModel.State == 1)
{
State = 3;//跳课
}
Rlist.Add(new
{
CourseRateName = (courseModel?.CourseId ?? 0) > 0 ? courseModel?.CourseRate.ToName() : "",
StudyID = studentStudyModel?.ID ?? 0,
Words = ((studentStudyModel?.Words ?? 0) > 0) ? studentStudyModel?.Words.ToString("F2") : "",
Practice = ((studentStudyModel?.Practice ?? 0) > 0) ? studentStudyModel?.Practice.ToString("F2") : "",
ReadingAloud = ((studentStudyModel?.ReadingAloud ?? 0) > 0) ? studentStudyModel?.ReadingAloud.ToString("F2") : "",
Other = !string.IsNullOrWhiteSpace(studentStudyModel?.Other ?? "") ? JsonHelper.DeserializeObject<List<StudyOther>>(studentStudyModel?.Other) : new List<StudyOther>(),
x.ChapterNo,
x.ChapterName,
x.CourseRate,
CourseRateName = x.CourseRate.ToName(),
x.ChapterGradeNo,
State,
AppointState,
AgainNum,
ClassDate,
x.ChapterId,
StudyType = 1,
}); ;
});
}
else
{
//跟班
cList.ForEach(x => { x.SortNum = Convert.ToDouble(x.ChapterNo); });
cList.OrderBy(x => x.SortNum).ToList().ForEach(x =>
{
var studentStudyModel = studyList?.FirstOrDefault(z => z.ChapterId == x.ChapterId && z.StudyType == 1);
Rlist.Add(new
{
CourseRateName = (courseModel?.CourseId ?? 0) > 0 ? courseModel?.CourseRate.ToName() : "",
StudyID = studentStudyModel?.ID ?? 0,
Words = ((studentStudyModel?.Words ?? 0) > 0) ? studentStudyModel?.Words.ToString("F2") : "",
Practice = ((studentStudyModel?.Practice ?? 0) > 0) ? studentStudyModel?.Practice.ToString("F2") : "",
ReadingAloud = ((studentStudyModel?.ReadingAloud ?? 0) > 0) ? studentStudyModel?.ReadingAloud.ToString("F2") : "",
Other = !string.IsNullOrWhiteSpace(studentStudyModel?.Other) ? JsonHelper.DeserializeObject<List<StudyOther>>(studentStudyModel?.Other) : new List<StudyOther>(),
x.ChapterNo,
x.ChapterName,
x.CourseRate,
CourseRateName = x.CourseRate.ToName(),
x.ChapterGradeNo,
State = 1,
x.ChapterId,
AppointState = 3,
AgainNum = 0,
ClassDate = "",
StudyType = 1,
});
});
}
}
if (studyList != null && studyList.Any(x => x.StudyType == 2))
{
var kaoshiList = studyList.Where(x => x.StudyType == 2).ToList();
Rlist.AddRange(kaoshiList.OrderBy(x => x.CreateTime).Select(x => new
{
CourseRateName = (courseModel?.CourseId ?? 0) > 0 ? courseModel?.CourseRate.ToName() : "",
StudyID = x?.ID ?? 0,
StudyType = x.StudyType,
Words = ((x?.Words ?? 0) > 0) ? x?.Words.ToString("F2") : "",
Practice = ((x?.Practice ?? 0) > 0) ? x?.Practice.ToString("F2") : "",
ReadingAloud = ((x?.ReadingAloud ?? 0) > 0) ? x?.ReadingAloud.ToString("F2") : "",
Other = !string.IsNullOrWhiteSpace(x?.Other) ? JsonHelper.DeserializeObject<List<StudyOther>>(x?.Other) : new List<StudyOther>(),
ChapterNo = "",
ChapterName = "",
CourseRate = "",
ChapterGradeNo = "",
State = 1,
AppointState = 3,
AgainNum = 0,
ClassDate = x?.StudyValue ?? "",
}));
}
return Rlist;
}
/// <summary>
/// 获取学员学习情况
/// </summary>
/// <param name="demodel"></param>
/// <returns></returns>
public object GetStuStudyMonthList(RB_Student_ViewModel demodel)
{
List<object> Rlist = new List<object>(); //获取学员学习情况打分
var studyList = studentStudyRepository.GetStudentStudyListRepository(new RB_Student_Study_ViewModel { CourseId = demodel.CourseId, StudyType = 3, StuId = demodel.StuId, GuestId = demodel.GuestId });
if (studyList != null && studyList.Any())
{
Rlist.AddRange(studyList.OrderBy(x => x.CreateTime).Select(x => new
{
StudyID = x?.ID ?? 0,
StudyType = x.StudyType,
Words = 0,
Practice = 0,
ReadingAloud = 0,
Other = !string.IsNullOrWhiteSpace(x?.Other) ? JsonHelper.DeserializeObject<List<StudyOther>>(x?.Other) : new List<StudyOther>(),
ChapterNo = "",
ChapterName = "",
CourseRate = "",
CourseRateName = "",
ChapterGradeNo = "",
State = 0,
AppointState = 0,
AgainNum = 0,
Remarks = x.Remarks ?? "",
ClassDate = x?.StudyValue ?? "",
}));
}
return Rlist;
}
/// <summary> /// <summary>
/// 获取学员上课记录 /// 获取学员上课记录
/// </summary> /// </summary>
...@@ -3764,7 +3963,7 @@ namespace Edu.Module.Course ...@@ -3764,7 +3963,7 @@ namespace Edu.Module.Course
Student_Id = demodel.Student_Id, Student_Id = demodel.Student_Id,
StuGuestState = demodel.GuestState, StuGuestState = demodel.GuestState,
GuestName = demodel.StuName, GuestName = demodel.StuName,
ClassScrollType=demodel.ClassScrollType ClassScrollType = demodel.ClassScrollType
}); });
if (dataList.Any()) if (dataList.Any())
{ {
......
Edu.Module.User/StudentStatModule.cs
View file @ 6e8e1554
...@@ -387,6 +387,7 @@ namespace Edu.Module.User ...@@ -387,6 +387,7 @@ namespace Edu.Module.User
var followModel = new StudentFollowStatic() var followModel = new StudentFollowStatic()
{ {
StuId = item.StuId, StuId = item.StuId,
GuestId = item.GuestId,
StuName = item.StuName,//姓名 StuName = item.StuName,//姓名
StuTel = item.StuTel, StuTel = item.StuTel,
CreateTime = Common.ConvertHelper.FormatDate(item.CreateTime),//报名日期 CreateTime = Common.ConvertHelper.FormatDate(item.CreateTime),//报名日期
......
Edu.Repository/Scroll/RB_Scroll_AppointmentRepository.cs
View file @ 6e8e1554
...@@ -202,6 +202,10 @@ ORDER BY r.Id desc "; ...@@ -202,6 +202,10 @@ ORDER BY r.Id desc ";
{ {
where += $@" and r.{nameof(RB_Scroll_Appointment_ViewModel.GuestId)} in({demodel.GuestIds})"; where += $@" and r.{nameof(RB_Scroll_Appointment_ViewModel.GuestId)} in({demodel.GuestIds})";
} }
if (demodel.LearnCourseId > 0)
{
where += $@" and r.{nameof(RB_Scroll_Appointment_ViewModel.LearnCourseId)} ={demodel.LearnCourseId}";
}
if (demodel.CourseId > 0) if (demodel.CourseId > 0)
{ {
where += $@" and r.{nameof(RB_Scroll_Appointment_ViewModel.CourseId)} ={demodel.CourseId}"; where += $@" and r.{nameof(RB_Scroll_Appointment_ViewModel.CourseId)} ={demodel.CourseId}";
......
Edu.Repository/User/RB_Student_OrderGuestRepository.cs
View file @ 6e8e1554
...@@ -170,7 +170,7 @@ GROUP BY A.Student_Id,A.OrderId ...@@ -170,7 +170,7 @@ GROUP BY A.Student_Id,A.OrderId
builder.AppendFormat(@" 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 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 ,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,IFNULL(C.OrderType,0) AS OrderType,IFNULL(C.SourceId,0) AS SourceId,B.ClassScrollType ,IFNULL(D.GuestName,'') AS GuestName,IFNULL(E.CourseName,'') AS CourseName,IFNULL(E.CourseId,0) as CourseId,IFNULL(C.OrderType,0) AS OrderType,IFNULL(C.SourceId,0) AS SourceId,B.ClassScrollType
FROM RB_Student_OrderGuest AS A INNER JOIN rb_order AS C ON A.OrderId=C.OrderId 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_order_guest AS D ON A.GuestId=D.Id
LEFT JOIN RB_student AS stu ON A.Student_Id=stu.StuId LEFT JOIN RB_student AS stu ON A.Student_Id=stu.StuId
...@@ -522,7 +522,7 @@ FROM rb_student s ...@@ -522,7 +522,7 @@ FROM rb_student s
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.AppendFormat(@" builder.AppendFormat(@"
SELECT s.StuId,s.StuName,s.StuTel,s.StuProfession,s.StuPurpose,s.JapanBaseInfo,s.CreateBy SELECT s.StuId,s.StuName,s.StuTel,s.StuProfession,s.StuPurpose,s.JapanBaseInfo,s.CreateBy
,o.CreateTime,o.PreferPrice,c.CourseName,c.CourseRate ,o.CreateTime,o.PreferPrice,c.CourseName,c.CourseRate,sog.GuestId
FROM rb_student s INNER JOIN rb_student_orderguest sog on sog.Student_Id = s.StuId FROM rb_student s INNER JOIN rb_student_orderguest sog on sog.Student_Id = s.StuId
INNER JOIN rb_order_guest AS og ON og.Id=sog.GuestId INNER JOIN rb_order_guest AS og ON og.Id=sog.GuestId
INNER JOIN rb_order o on sog.OrderId = o.OrderId AND o.JoinType=1 AND o.OrderState<>3 INNER JOIN rb_order o on sog.OrderId = o.OrderId AND o.JoinType=1 AND o.OrderState<>3
......
Edu.Repository/User/RB_Student_StudyRepository.cs
View file @ 6e8e1554
using Edu.Model.Entity.User; using Edu.Model.Entity.User;
using Edu.Model.ViewModel.Course;
using Edu.Model.ViewModel.User; using Edu.Model.ViewModel.User;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
...@@ -25,6 +26,26 @@ SELECT A.* ...@@ -25,6 +26,26 @@ SELECT A.*
FROM RB_Student_Study AS A FROM RB_Student_Study AS A
WHERE 1=1 WHERE 1=1
"); ");
if (query != null)
{
if (query.CourseId > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_Study_ViewModel.CourseId), query.CourseId);
}
if (query.StuId > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_Study_ViewModel.StuId), query.StuId);
}
if (query.StudyType > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_Study_ViewModel.StudyType), query.StudyType);
}
if (query.ChapterId > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_Study_ViewModel.ChapterId), query.ChapterId);
}
}
return Get<RB_Student_Study_ViewModel>(builder.ToString()).ToList(); return Get<RB_Student_Study_ViewModel>(builder.ToString()).ToList();
} }
} }
......
Edu.WebApi/Controllers/Course/ScrollController.cs
View file @ 6e8e1554
...@@ -4,11 +4,14 @@ using Edu.Common.Enum.Course; ...@@ -4,11 +4,14 @@ using Edu.Common.Enum.Course;
using Edu.Common.Plugin; using Edu.Common.Plugin;
using Edu.Model.ViewModel.Query; using Edu.Model.ViewModel.Query;
using Edu.Model.ViewModel.Scroll; using Edu.Model.ViewModel.Scroll;
using Edu.Model.ViewModel.User;
using Edu.Module.Course; using Edu.Module.Course;
using Edu.WebApi.Filter; using Edu.WebApi.Filter;
using Microsoft.AspNetCore.Cors; using Microsoft.AspNetCore.Cors;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
using Newtonsoft.Json.Serialization;
using RabbitMQ.Client.Framing.Impl;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
...@@ -1220,6 +1223,117 @@ namespace Edu.WebApi.Controllers.Course ...@@ -1220,6 +1223,117 @@ namespace Edu.WebApi.Controllers.Course
var list = scrollClassModule.GetStuLearnChapterList(demodel); var list = scrollClassModule.GetStuLearnChapterList(demodel);
return ApiResult.Success("", list); return ApiResult.Success("", list);
} }
#region 学习情况 2024-05-06 add by:W
/// <summary>
/// 获取学员学习情况
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetStuStudyList()
{
var userInfo = base.UserInfo;
RB_Student_ViewModel demodel = JsonHelper.DeserializeObject<RB_Student_ViewModel>(base.RequestParm.Msg.ToString());
demodel.Group_Id = userInfo.Group_Id;
var list = scrollClassModule.GetStuStudyList(demodel);
return ApiResult.Success("", list);
}
/// <summary>
/// 获取学员学习情况月度总结
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetStuStudyMonthList()
{
var userInfo = base.UserInfo;
RB_Student_ViewModel demodel = JsonHelper.DeserializeObject<RB_Student_ViewModel>(base.RequestParm.Msg.ToString());
demodel.Group_Id = userInfo.Group_Id;
var list = scrollClassModule.GetStuStudyMonthList(demodel);
return ApiResult.Success("", list);
}
/// <summary>
/// 获取学员学习情况
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetStuStudyInfo()
{
var userInfo = base.UserInfo;
RB_Student_Study_ViewModel demodel = new RB_Student_Study_ViewModel()
{
StudyType = base.ParmJObj.GetInt("StudyType", 1),
ChapterId = base.ParmJObj.GetInt("ChapterId", 0),
ID = base.ParmJObj.GetInt("StudyID", 0),
CourseId = base.ParmJObj.GetInt("CourseId", 0),
OrderId = base.ParmJObj.GetInt("OrderId", 0),
GuestId = base.ParmJObj.GetInt("GuestId", 0),
StuId = base.ParmJObj.GetInt("StuId", 0),
Words = base.ParmJObj.GetDecimal("Words"),
Practice = base.ParmJObj.GetDecimal("Practice"),
ReadingAloud = base.ParmJObj.GetDecimal("ReadingAloud"),
StudyValue = base.ParmJObj.GetStringValue("StudyValue"),
Remarks = base.ParmJObj.GetStringValue("Remarks"),
};
string other = base.ParmJObj.GetStringValue("Other");
List<StudyOther> otherList = new List<StudyOther>();
if (!string.IsNullOrWhiteSpace(other))
{
JArray otherListArray = JArray.Parse(other);
if (otherListArray != null && otherListArray.Count > 0)
{
foreach (var jItem in otherListArray)
{
JObject jobj = JObject.Parse(JsonHelper.Serialize(jItem));
string score = jobj.GetStringValue("Score");
string name = jobj.GetStringValue("Name");
if (!string.IsNullOrWhiteSpace(name) || !string.IsNullOrWhiteSpace(score))
{
decimal rScore = 0;
try
{
rScore = !string.IsNullOrWhiteSpace(score) ? Convert.ToDecimal(score) : 0;
}
catch (Exception ex)
{
rScore = 0;
}
otherList.Add(new StudyOther
{
Name = name,
Score = rScore,
});
}
}
}
}
if (otherList != null && otherList.Any())
{
demodel.Other = JsonHelper.Serialize(otherList);
}
else
{
demodel.Other = "";
}
if (demodel.ID == 0)
{
demodel.CreateTime = DateTime.Now;
demodel.CreateBy = userInfo.Id;
}
demodel.UpdateTime = DateTime.Now;
demodel.UpdateBy = userInfo.Id;
var result = scrollClassModule.SetStuStudy(demodel);
return result ? ApiResult.Success("") : ApiResult.Failed("操作失败");
}
#endregion
/// <summary> /// <summary>
/// 获取学员上课列表 2023-12-12 add by:W /// 获取学员上课列表 2023-12-12 add by:W
/// </summary> /// </summary>
......
Edu.WebApi/Controllers/Customer/CustomerStudentController.cs
View file @ 6e8e1554
...@@ -41,7 +41,7 @@ namespace Edu.WebApi.Controllers.Customer ...@@ -41,7 +41,7 @@ namespace Edu.WebApi.Controllers.Customer
var query = new RB_Student_Appointment_Extend() var query = new RB_Student_Appointment_Extend()
{ {
StuId = base.ParmJObj.GetInt("StuId"), StuId = base.ParmJObj.GetInt("StuId"),
Id=base.ParmJObj.GetInt("Id"), Id = base.ParmJObj.GetInt("Id"),
}; };
query.Group_Id = base.UserInfo.Group_Id; query.Group_Id = base.UserInfo.Group_Id;
var data = customerStudentModule.GetStudentAppointmentPageModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query); var data = customerStudentModule.GetStudentAppointmentPageModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
...@@ -54,7 +54,7 @@ namespace Edu.WebApi.Controllers.Customer ...@@ -54,7 +54,7 @@ namespace Edu.WebApi.Controllers.Customer
item.Id, item.Id,
item.StuId, item.StuId,
item.AppointmentPoint, item.AppointmentPoint,
AppointmentTime=Common.ConvertHelper.FormatTime(item.AppointmentTime), AppointmentTime = Common.ConvertHelper.FormatTime(item.AppointmentTime),
item.Remark, item.Remark,
item.Feedback, item.Feedback,
CreateTime = Common.ConvertHelper.FormatTimeStr2(item.CreateTime), CreateTime = Common.ConvertHelper.FormatTimeStr2(item.CreateTime),
...@@ -124,7 +124,7 @@ namespace Edu.WebApi.Controllers.Customer ...@@ -124,7 +124,7 @@ namespace Edu.WebApi.Controllers.Customer
public ApiResult RemoveStudentAppointment() public ApiResult RemoveStudentAppointment()
{ {
var Id = base.ParmJObj.GetInt("Id"); var Id = base.ParmJObj.GetInt("Id");
var model = customerStudentModule.RemoveStudentAppointmentModule(Id,base.UserInfo.Id); var model = customerStudentModule.RemoveStudentAppointmentModule(Id, base.UserInfo.Id);
return ApiResult.Success(data: model); return ApiResult.Success(data: model);
} }
...@@ -232,7 +232,7 @@ namespace Edu.WebApi.Controllers.Customer ...@@ -232,7 +232,7 @@ namespace Edu.WebApi.Controllers.Customer
public ApiResult RemoveStudentFollow() public ApiResult RemoveStudentFollow()
{ {
var Id = base.ParmJObj.GetInt("Id"); var Id = base.ParmJObj.GetInt("Id");
var model = customerStudentModule.RemoveStudentFollowModule(Id,base.UserInfo.Id); var model = customerStudentModule.RemoveStudentFollowModule(Id, base.UserInfo.Id);
return ApiResult.Success(data: model); return ApiResult.Success(data: model);
} }
...@@ -247,7 +247,7 @@ namespace Edu.WebApi.Controllers.Customer ...@@ -247,7 +247,7 @@ namespace Edu.WebApi.Controllers.Customer
var query = new RB_Student_Visit_Extend() var query = new RB_Student_Visit_Extend()
{ {
StuId = base.ParmJObj.GetInt("StuId"), StuId = base.ParmJObj.GetInt("StuId"),
Id=base.ParmJObj.GetInt("Id"), Id = base.ParmJObj.GetInt("Id"),
}; };
query.Group_Id = base.UserInfo.Group_Id; query.Group_Id = base.UserInfo.Group_Id;
var data = customerStudentModule.GetStudentVisitPageModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query); var data = customerStudentModule.GetStudentVisitPageModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
...@@ -291,10 +291,10 @@ namespace Edu.WebApi.Controllers.Customer ...@@ -291,10 +291,10 @@ namespace Edu.WebApi.Controllers.Customer
{ {
Id = base.ParmJObj.GetInt("Id"), Id = base.ParmJObj.GetInt("Id"),
StuId = base.ParmJObj.GetInt("StuId"), StuId = base.ParmJObj.GetInt("StuId"),
School_Id=base.ParmJObj.GetInt("School_Id"), School_Id = base.ParmJObj.GetInt("School_Id"),
Date=base.ParmJObj.GetDateTime("Date"), Date = base.ParmJObj.GetDateTime("Date"),
VisitTime=base.ParmJObj.GetStringValue("VisitTime"), VisitTime = base.ParmJObj.GetStringValue("VisitTime"),
ReceptionPersion=base.ParmJObj.GetInt("ReceptionPersion"), ReceptionPersion = base.ParmJObj.GetInt("ReceptionPersion"),
Remark = base.ParmJObj.GetStringValue("Remark"), Remark = base.ParmJObj.GetStringValue("Remark"),
}; };
if (extModel.ReceptionPersion <= 0) if (extModel.ReceptionPersion <= 0)
...@@ -308,7 +308,7 @@ namespace Edu.WebApi.Controllers.Customer ...@@ -308,7 +308,7 @@ namespace Edu.WebApi.Controllers.Customer
extModel.UpdateTime = DateTime.Now; extModel.UpdateTime = DateTime.Now;
extModel.Group_Id = base.UserInfo.Group_Id; extModel.Group_Id = base.UserInfo.Group_Id;
bool flag = customerStudentModule.SetStudentVisitModule(extModel); bool flag = customerStudentModule.SetStudentVisitModule(extModel);
return flag ? ApiResult.Success(data:extModel) : ApiResult.Failed(); return flag ? ApiResult.Success(data: extModel) : ApiResult.Failed();
} }
/// <summary> /// <summary>
...@@ -345,7 +345,7 @@ namespace Edu.WebApi.Controllers.Customer ...@@ -345,7 +345,7 @@ namespace Edu.WebApi.Controllers.Customer
public ApiResult RemoveStudentVisit() public ApiResult RemoveStudentVisit()
{ {
var Id = base.ParmJObj.GetInt("Id"); var Id = base.ParmJObj.GetInt("Id");
var model = customerStudentModule.RemoveStudentVisitModule(Id,base.UserInfo.Id); var model = customerStudentModule.RemoveStudentVisitModule(Id, base.UserInfo.Id);
return ApiResult.Success(data: model); return ApiResult.Success(data: model);
} }
...@@ -370,7 +370,7 @@ namespace Edu.WebApi.Controllers.Customer ...@@ -370,7 +370,7 @@ namespace Edu.WebApi.Controllers.Customer
{ {
query.Group_Id = base.UserInfo.Group_Id; query.Group_Id = base.UserInfo.Group_Id;
} }
var data = customerStudentModule.GetStudentLogPageModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query); var data = customerStudentModule.GetStudentLogPageModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
List<object> list = new List<object>(); List<object> list = new List<object>();
foreach (var item in data) foreach (var item in data)
...@@ -389,12 +389,12 @@ namespace Edu.WebApi.Controllers.Customer ...@@ -389,12 +389,12 @@ namespace Edu.WebApi.Controllers.Customer
item.LogId, item.LogId,
item.StuId, item.StuId,
item.LogType, item.LogType,
LogTypeName=item.LogType.ToName(), LogTypeName = item.LogType.ToName(),
item.LogTitle, item.LogTitle,
item.LogContent, item.LogContent,
item.CreateType, item.CreateType,
CreateTypeStr=item.CreateType==1?"系统用户":"同业用户", CreateTypeStr = item.CreateType == 1 ? "系统用户" : "同业用户",
CreateTimeStr=Common.ConvertHelper.FormatTimeStr2(item.CreateTime), CreateTimeStr = Common.ConvertHelper.FormatTimeStr2(item.CreateTime),
CreateByName CreateByName
}); });
...@@ -426,12 +426,14 @@ namespace Edu.WebApi.Controllers.Customer ...@@ -426,12 +426,14 @@ namespace Edu.WebApi.Controllers.Customer
item.Student_Id, item.Student_Id,
item.ClassName, item.ClassName,
item.ClassNo, item.ClassNo,
item.ClassId,
item.TotalHours, item.TotalHours,
item.CompleteHours, item.CompleteHours,
item.GuestName, item.GuestName,
item.CourseName, item.CourseName,
item.ClassScrollType, item.ClassScrollType,
item.OrderType, item.OrderType,
item.CourseId,
}); });
} }
pageModel.Count = rowsCount; pageModel.Count = rowsCount;
...@@ -449,7 +451,7 @@ namespace Edu.WebApi.Controllers.Customer ...@@ -449,7 +451,7 @@ namespace Edu.WebApi.Controllers.Customer
var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString()); var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
var query = new RB_Student_OrderGuest_ViewModel() var query = new RB_Student_OrderGuest_ViewModel()
{ {
Student_Id = base.ParmJObj.GetInt("StuId"), Student_Id = base.ParmJObj.GetInt("StuId"),
}; };
var data = customerStudentModule.GetStuOrderGuestContractPageModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query); var data = customerStudentModule.GetStuOrderGuestContractPageModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
List<object> list = new List<object>(); List<object> list = new List<object>();
...@@ -505,7 +507,7 @@ namespace Edu.WebApi.Controllers.Customer ...@@ -505,7 +507,7 @@ namespace Edu.WebApi.Controllers.Customer
public ApiResult SetStudentAssistBatch() public ApiResult SetStudentAssistBatch()
{ {
var stuIds = base.ParmJObj.GetStringValue("stuIds"); var stuIds = base.ParmJObj.GetStringValue("stuIds");
var result = customerStudentModule.SetStudentAssistBatchModule(stuIds,base.UserInfo.Id); var result = customerStudentModule.SetStudentAssistBatchModule(stuIds, base.UserInfo.Id);
return result.result ? ApiResult.Success(message: result.msg) : ApiResult.Failed(message: result.msg); return result.result ? ApiResult.Success(message: result.msg) : ApiResult.Failed(message: result.msg);
} }
...@@ -585,8 +587,8 @@ namespace Edu.WebApi.Controllers.Customer ...@@ -585,8 +587,8 @@ namespace Edu.WebApi.Controllers.Customer
var model = new RB_Stage() var model = new RB_Stage()
{ {
Id = base.ParmJObj.GetInt("Id"), Id = base.ParmJObj.GetInt("Id"),
StageName=base.ParmJObj.GetStringValue("StageName"), StageName = base.ParmJObj.GetStringValue("StageName"),
No=base.ParmJObj.GetInt("No"), No = base.ParmJObj.GetInt("No"),
}; };
if (model.No <= 0) if (model.No <= 0)
{ {
...@@ -660,7 +662,7 @@ namespace Edu.WebApi.Controllers.Customer ...@@ -660,7 +662,7 @@ namespace Edu.WebApi.Controllers.Customer
{ {
Id = base.ParmJObj.GetInt("Id"), Id = base.ParmJObj.GetInt("Id"),
Name = base.ParmJObj.GetStringValue("Name"), Name = base.ParmJObj.GetStringValue("Name"),
Info=base.ParmJObj.GetStringValue("Info"), Info = base.ParmJObj.GetStringValue("Info"),
No = base.ParmJObj.GetInt("No"), No = base.ParmJObj.GetInt("No"),
}; };
if (model.No <= 0) if (model.No <= 0)
...@@ -761,8 +763,8 @@ namespace Edu.WebApi.Controllers.Customer ...@@ -761,8 +763,8 @@ namespace Edu.WebApi.Controllers.Customer
{ {
var extModel = new RB_LearningGoals_Extend() var extModel = new RB_LearningGoals_Extend()
{ {
Id=base.ParmJObj.GetInt("Id"), Id = base.ParmJObj.GetInt("Id"),
Name=base.ParmJObj.GetStringValue("Name"), Name = base.ParmJObj.GetStringValue("Name"),
}; };
extModel.Group_Id = base.UserInfo.Group_Id; extModel.Group_Id = base.UserInfo.Group_Id;
extModel.CreateBy = base.UserInfo.Id; extModel.CreateBy = base.UserInfo.Id;
...@@ -872,7 +874,7 @@ namespace Edu.WebApi.Controllers.Customer ...@@ -872,7 +874,7 @@ namespace Edu.WebApi.Controllers.Customer
{ {
Id = base.ParmJObj.GetInt("Id"), Id = base.ParmJObj.GetInt("Id"),
Name = base.ParmJObj.GetStringValue("Name"), Name = base.ParmJObj.GetStringValue("Name"),
}; };
string staticTypes = base.ParmJObj.GetStringValue("StaticTypeList"); string staticTypes = base.ParmJObj.GetStringValue("StaticTypeList");
List<string> Ids = new List<string>(); List<string> Ids = new List<string>();
......
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