Skip to content

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

页面修改

parent 10e3a85b
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 18 deletions
Edu.Module.User/StudentStatModule.cs
View file @ d676f12d
......@@ -395,7 +395,11 @@ namespace Edu.Module.User
AssistList = item.AssistList,
CreateByName = item.CreateByName,
RenewOrderList = xlist?.Where(x => x.StuId == item.StuId)?.Select(x => new { x.CourseName, x.CourseRate, CourseRateName = x.CourseRate > 0 ? Common.Plugin.EnumHelper.ToName((CourseRateEnum)x.CourseRate) : "", x.PreferPrice }),
FollowList = item.FollowList?.Select(x => new { Remark = Common.Plugin.StringHelper.FilterHtml(x.Remark), CreateTime = x.CreateTime.ToString("yyyy-MM-dd HH:mm:ss") }),
FollowList = item.FollowList?.Select(x => new
{
Remark = Common.Plugin.StringHelper.FilterHtml(x.Remark),
CreateTime = x.CreateTime.ToString("yy-MM-dd")
}),
IsShowFollowAll = false,
};
RList.Add(followModel);
......
Edu.Repository/User/RB_Student_OrderGuestRepository.cs
View file @ d676f12d
......@@ -89,7 +89,7 @@ WHERE 1=1 AND C.OrderState IN(1) AND D.Status=0
//课程等级
if (query.CourseRate > 0)
{
builder.AppendFormat(" AND EXISTS(SELECT 1 FROM rb_course_chapter WHERE `Status`=0 AND CourseId=C.CourseId AND CourseRate IN({0}))",(int)query.CourseRate);
builder.AppendFormat(" AND EXISTS(SELECT 1 FROM rb_course_chapter WHERE `Status`=0 AND CourseId=C.CourseId AND CourseRate IN({0}))", (int)query.CourseRate);
}
//学员状态
if (query.StuGuestState > 0)
......@@ -118,7 +118,7 @@ FROM RB_Student_OrderGuest AS A INNER JOIN rb_order AS C ON A.OrderId=C.OrderId
WHERE 1=1 AND C.OrderState<>3 AND D.Status=0
");
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_OrderGuest_ViewModel.Status), (int)DateStateEnum.Normal);
if (query != null)
{
if (query.ClassId > 0)
......@@ -163,7 +163,7 @@ GROUP BY A.Student_Id,A.OrderId
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_Student_OrderGuest_ViewModel> GetStuOrderGuestPageRepository(int pageIndex,int pageSize,out long rowsCount, RB_Student_OrderGuest_ViewModel query)
public List<RB_Student_OrderGuest_ViewModel> GetStuOrderGuestPageRepository(int pageIndex, int pageSize, out long rowsCount, RB_Student_OrderGuest_ViewModel query)
{
var parameters = new DynamicParameters();
StringBuilder builder = new StringBuilder();
......@@ -385,7 +385,7 @@ FROM rb_student_orderguest og
INNER JOIN rb_order_guest g on og.GuestId = g.Id
INNER JOIN rb_order o on og.OrderId = o.OrderId
INNER JOIN rb_class c on o.ClassId = c.ClassId
WHERE og.Status =0 and g.`Status` =0 and o.Group_Id ={group_Id} and o.OrderState <>3 and o.OrderType =1 and og.Student_Id ={accountId} and {(Type==1? "g.TotalHours > g.CompleteHours" : "g.TotalHours <= g.CompleteHours")}
WHERE og.Status =0 and g.`Status` =0 and o.Group_Id ={group_Id} and o.OrderState <>3 and o.OrderType =1 and og.Student_Id ={accountId} and {(Type == 1 ? "g.TotalHours > g.CompleteHours" : "g.TotalHours <= g.CompleteHours")}
ORDER BY {(Type == 1 ? "og.Id asc" : "og.Id desc")} LIMIT 1";
return Get<RB_Student_OrderGuest_ViewModel>(sql).FirstOrDefault();
}
......@@ -396,7 +396,7 @@ ORDER BY {(Type == 1 ? "og.Id asc" : "og.Id desc")} LIMIT 1";
/// <param name="accountId"></param>
/// <param name="group_Id"></param>
/// <returns></returns>
public RB_Student_OrderGuest_ViewModel GetStudentLearningCourse(int accountId, int group_Id, int guestId =0)
public RB_Student_OrderGuest_ViewModel GetStudentLearningCourse(int accountId, int group_Id, int guestId = 0)
{
string sql = $@"
SELECT og.*,o.CourseId,g.CourseChapterNo,c.ClassScrollType,o.ScrollSchoolId
......@@ -412,7 +412,7 @@ WHERE og.Status =0 AND g.`Status` =0 AND o.OrderState <>3 AND o.OrderType =1
}
if (accountId > 0)
{
sql += $" AND og.Student_Id ={ accountId} ";
sql += $" AND og.Student_Id ={accountId} ";
}
if (guestId > 0)
{
......@@ -431,7 +431,8 @@ WHERE og.Status =0 AND g.`Status` =0 AND o.OrderState <>3 AND o.OrderType =1
/// </summary>
/// <param name="stuIds"></param>
/// <returns></returns>
public List<RB_Student_OrderGuest_ViewModel> GetStuOrderList(string stuIds, int groupId) {
public List<RB_Student_OrderGuest_ViewModel> GetStuOrderList(string stuIds, int groupId)
{
string sql = $@"select sog.* from RB_Student_OrderGuest sog
INNER JOIN rb_order o on sog.OrderId = o.OrderId
where sog.Status =0 and o.Group_Id ={groupId} and Student_Id in({stuIds})";
......@@ -469,7 +470,7 @@ where sog.Status =0 and o.Group_Id ={group_Id} and o.OrderState <>3 and IFNULL(o
string joinType = "INNER JOIN";
if (demodel.QueryTpye == 3)
{
joinType= "LEFT JOIN";
joinType = "LEFT JOIN";
}
string sql = $@"
SELECT s.StuId,s.StuName,s.StuTel,s.FirstEnrollDate,s.StuRealMobile,s.StuPurpose,s.QQ,DATE_FORMAT(ec.CreateTime,'%Y-%m-%d') as followUpTime
......@@ -490,7 +491,8 @@ FROM rb_student s
WHERE A.Status=0 AND A.CheckStatus=0 GROUP BY B.Student_Id
) AS clcheck ON s.StuId=clcheck.Student_Id
";
if (!string.IsNullOrEmpty(demodel.SFTime) && !string.IsNullOrEmpty(demodel.EFTime)) {
if (!string.IsNullOrEmpty(demodel.SFTime) && !string.IsNullOrEmpty(demodel.EFTime))
{
//增加跟进链表
sql += $@" LEFT JOIN rb_student_follow f on s.StuId = f.StuId and f.`Status` =0 and f.AssistType in(2,4) and f.CreateTime >='{demodel.SFTime}' and f.CreateTime <='{demodel.EFTime} 23:59:59'";
}
......@@ -526,7 +528,7 @@ FROM rb_student s
SELECT o.CreateTime,s.StuId,s.StuName,s.StuTel,s.StuProfession,s.StuPurpose,c.CourseName,c.CourseRate,o.PreferPrice,s.JapanBaseInfo,s.CreateBy
FROM rb_student s
{joinType} rb_student_orderguest og on og.Student_Id = s.StuId
{joinType} (SELECT og.Student_Id,min(og.Id) as Id FROM rb_student_orderguest og INNER JOIN rb_order o on og.OrderId = o.OrderId WHERE o.OrderState <>3 GROUP BY og.Student_Id) stu on og.Id = stu.Id and og.Student_Id = s.StuId
{joinType} (SELECT og.Student_Id,min(og.Id) as Id FROM rb_student_orderguest og INNER JOIN rb_order o on og.OrderId = o.OrderId WHERE o.OrderState <>3 GROUP BY og.Student_Id) stu on og.Id = stu.Id and og.Student_Id = s.StuId
{joinType} rb_order_guest org on org.Id = og.GuestId
{joinType} rb_order o on og.OrderId = o.OrderId
{joinType} rb_class cl on cl.ClassId = o.ClassId
......@@ -562,7 +564,7 @@ FROM rb_student s
/// <param name="count"></param>
/// <param name="demodel"></param>
/// <returns></returns>
public List<RB_Student_ViewModel> GetStudentRenewRepository( int group_Id,string stuIds)
public List<RB_Student_ViewModel> GetStudentRenewRepository(int group_Id, string stuIds)
{
string sql = $@"
SELECT s.StuId,c.CourseName,c.CourseRate,o.PreferPrice
......@@ -576,7 +578,7 @@ WHERE s.Group_Id ={group_Id} and o.JoinType=3 and s.`Status` =0 and sog.`Status`
return Get<RB_Student_ViewModel>(sql).ToList();
}
public string GetStudentFollowUpSql(RB_Student_ViewModel demodel, out DynamicParameters parameters)
public string GetStudentFollowUpSql(RB_Student_ViewModel demodel, out DynamicParameters parameters)
{
parameters = new DynamicParameters();
string where = " 1=1 and s.Status =0 and c.CourseId <>1 ";//排除内部班课程
......@@ -862,12 +864,14 @@ FROM rb_student s
{
where += $" and og.GuestState ={(int)demodel.StuGuestState}";
}
if (demodel.Q_EnrollState > 0) {
if (demodel.Q_EnrollState > 0)
{
if (demodel.Q_EnrollState == 1)
{
where += $" and o.OrderId is not null and c.CourseId <>1";//排除内部班
}
else {
else
{
where += $" and o.OrderId is null";
}
}
......@@ -949,7 +953,7 @@ LEFT JOIN rb_channel ch on s.StuChannel = ch.Id";
//增加跟进链表
sql += $@" LEFT JOIN rb_student_follow f on s.StuId = f.StuId and f.`Status` =0 and f.AssistType =2 and f.CreateTime >='{demodel.SFTime}' and f.CreateTime <='{demodel.EFTime} 23:59:59'";
}
sql +=$@" WHERE {where}
sql += $@" WHERE {where}
GROUP BY s.StuId order by s.StuId desc";
return GetPage<RB_Student_ViewModel>(pageIndex, pageSize, out count, sql, parameters).ToList();
}
......@@ -978,7 +982,8 @@ WHERE `Status` =0 and State <>5 and CourseEndTime >=NOW() and Group_Id ={group_I
) sa on sog.Student_Id = sa.StuId
WHERE o.Group_Id ={group_Id} and sog.`Status` =0 and og.GuestState <>2 and o.OrderState <>3 and c.ClassScrollType =2
and og.TotalChapterNo > og.CourseChapterNo and (og.CourseChapterNo + 1 + IFNULL(sa.AppointNum,0)) =cc.ChapterNo";
if (SchoolId >= 0) {
if (SchoolId >= 0)
{
sql += $@" and o.ScrollSchoolId ={SchoolId}";
}
......@@ -1024,7 +1029,7 @@ WHERE o.Group_Id ={group_Id} and sog.`Status` =0 and og.GuestState NOT IN(2) and
sql += $@" and o.ScrollSchoolId ={SchoolId}";
}
//sql += string.Format(@" AND EXISTS (SELECT 1 FROM rb_course_chapter WHERE Status=0 AND CourseId= o.CourseId AND ParentId =0 AND ChapterGradeNo ={0} AND CourseRate ={1})", NextChapterGradeNo, CourseGradeId);
sql += string.Format(@" AND EXISTS (SELECT 1 FROM rb_course_chapter WHERE Status=0 AND CourseId= o.CourseId AND ParentId =0 AND CourseRate ={0})", CourseGradeId);
sql += string.Format(@" AND EXISTS (SELECT 1 FROM rb_course_chapter WHERE Status=0 AND CourseId= o.CourseId AND ParentId =0 AND CourseRate ={0})", CourseGradeId);
return Get<RB_Student_OrderGuest_ViewModel>(sql, parameters).ToList();
}
......
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