Skip to content

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

页面修改

parent faeea1b1
Hide whitespace changes
Inline Side-by-side
Showing with 111 additions and 112 deletions
Edu.Module.User/StudentModule.cs
View file @ 2154d102
......@@ -1263,7 +1263,7 @@ namespace Edu.Module.User
QueryDate = Common.ConvertHelper.FormatDate(DateTime.Now),
CreateBy = CreateBy
};
var list = student_AppointmentRepository.GetStudentAppointmentPageRepository(pageIndex,pageSize,out rowsCount, query);
var list = student_AppointmentRepository.GetStudentAppointmentPageRepository(pageIndex, pageSize, out rowsCount, query);
if (list != null && list.Count > 0)
{
string createByIds = string.Join(",", list.Select(qitem => qitem.CreateBy));
......@@ -1291,7 +1291,7 @@ namespace Edu.Module.User
}
/// <summary>
/// 今日需联系线索（之前预约或者24小时内收到的新线索）
/// 今日需联系学员（之前预约的跟进学员或本周期内需要跟进的学员）
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
......@@ -1301,12 +1301,8 @@ namespace Edu.Module.User
public List<object> GetTodayConnectPageModule(int pageIndex, int pageSize, out long rowsCount, int CreateBy)
{
List<object> result = new List<object>();
var query = new RB_Student_Appointment_Extend()
{
QueryDate = Common.ConvertHelper.FormatDate(DateTime.Now),
CreateBy = CreateBy
};
var list = student_AppointmentRepository.GetStudentAppointmentPageRepository(pageIndex, pageSize, out rowsCount, query);
var list = student_AppointmentRepository.GetTodayConnectPageRepository(pageIndex, pageSize, out rowsCount, Common.ConvertHelper.FormatDate(DateTime.Now), CreateBy);
if (list != null && list.Count > 0)
{
string createByIds = string.Join(",", list.Select(qitem => qitem.CreateBy));
......@@ -1320,13 +1316,77 @@ namespace Edu.Module.User
var tempEmp = empList?.FirstOrDefault(qitem => qitem.Id == item.CreateBy);
result.Add(new
{
item.Id,
item.StuId,
item.StuName,
item.CreateBy,
EmployeeName = tempEmp?.AccountName,
CreateTime = Common.ConvertHelper.FormatTime(item.CreateTime),
item.Feedback,
});
}
}
return result;
}
/// <summary>
/// 分配给我的线索 （分配给我，但是没有跟进的线索）
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="rowsCount"></param>
/// <param name="UserId"></param>
/// <returns></returns>
public List<object> GetMyClueModule(int pageIndex, int pageSize, out long rowsCount, int UserId)
{
rowsCount = 0;
var query = new RB_Student_ViewModel()
{
IsQueryNotFollow = 1,
IsQueryMyStu = 1,
CreateBy = UserId
};
List<object> result = new List<object>();
var list = studentRepository.GetStudentPageListRepository(pageIndex, pageSize, out rowsCount, query);
if (list != null && list.Count > 0)
{
foreach (var item in list)
{
result.Add(new
{
item.StuId,
item.StuName,
});
}
}
return result;
}
/// <summary>
/// 分配给我的学员 （分配给我，但是没有跟进的学员）
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="rowsCount"></param>
/// <param name="UserId"></param>
/// <returns></returns>
public List<object> GetMyStudentModule(int pageIndex, int pageSize, out long rowsCount, int UserId)
{
rowsCount = 0;
var query = new RB_Student_ViewModel()
{
IsQueryNotFollow = 1,
IsQueryMyStu = 1,
CreateBy = UserId
};
List<object> result = new List<object>();
var list = studentRepository.GetStudentPageListRepository(pageIndex, pageSize, out rowsCount, query);
if (list != null && list.Count > 0)
{
foreach (var item in list)
{
result.Add(new
{
item.StuId,
item.StuName,
});
}
}
......@@ -1605,71 +1665,5 @@ namespace Edu.Module.User
}
return result;
}
/// <summary>
/// 分配给我的学员 （分配给我，但是没有跟进的学员）
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="rowsCount"></param>
/// <param name="UserId"></param>
/// <returns></returns>
public List<object> GetMyStudentModule(int pageIndex, int pageSize, out long rowsCount, int UserId)
{
rowsCount = 0;
var query = new RB_Student_ViewModel()
{
IsQueryNotFollow = 1,
IsQueryMyStu = 1,
CreateBy = UserId
};
List<object> result = new List<object>();
var list = studentRepository.GetStudentPageListRepository(pageIndex, pageSize, out rowsCount, query);
if (list != null && list.Count > 0)
{
foreach (var item in list)
{
result.Add(new
{
item.StuId,
item.StuName,
});
}
}
return result;
}
/// <summary>
/// 分配给我的线索 （分配给我，但是没有跟进的线索）
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="rowsCount"></param>
/// <param name="UserId"></param>
/// <returns></returns>
public List<object> GetMyClueModule(int pageIndex, int pageSize, out long rowsCount, int UserId)
{
rowsCount = 0;
var query = new RB_Student_ViewModel()
{
IsQueryNotFollow = 1,
IsQueryMyStu = 1,
CreateBy = UserId
};
List<object> result = new List<object>();
var list = studentRepository.GetStudentPageListRepository(pageIndex, pageSize, out rowsCount, query);
if (list != null && list.Count > 0)
{
foreach (var item in list)
{
result.Add(new
{
item.StuId,
item.StuName,
});
}
}
return result;
}
}
}
Edu.Repository/Customer/RB_Student_AppointmentRepository.cs
View file @ 2154d102
using Edu.Common.Enum;
using Edu.Model.Entity.Customer;
using Edu.Model.ViewModel.Customer;
using Edu.Model.ViewModel.User;
using System;
using System.Collections.Generic;
using System.Linq;
......@@ -106,50 +107,54 @@ WHERE 1=1
return Get<RB_Student_Appointment_Extend>(builder.ToString()).ToList();
}
/// <summary>
/// 获取约访统计列表
/// 今日需联系学员（之前预约的跟进学员或本周期内需要跟进的学员）
/// </summary>
/// <param name="query"></param>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="rowsCount"></param>
/// <param name=""></param>
/// <returns></returns>
public List<RB_Student_Appointment_Extend> GetStudentVisitListRepository(RB_Student_Appointment_Extend query)
public List<RB_Student_ViewModel> GetTodayConnectPageRepository(int pageIndex,int pageSize,out long rowsCount,string date,int CreateBy)
{
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
SELECT A.*,B.StuName
FROM RB_Student_Appointment AS A INNER JOIN rb_student AS B ON A.StuId=B.StuId
WHERE 1=1
");
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_Appointment_Extend.Status), (int)DateStateEnum.Normal);
if (query != null)
string where1="", where2="";
if (!string.IsNullOrEmpty(date))
{
if (query.Group_Id > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_Appointment_Extend.Group_Id), query.Group_Id);
}
if (query.StuId > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_Appointment_Extend.StuId), query.StuId);
}
if (query.CreateBy > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_Appointment_Extend.CreateBy), query.CreateBy);
}
//指定日期的约访统计
if (!string.IsNullOrEmpty(query.QueryDate))
{
builder.AppendFormat(" AND ( DATE_FORMAT(A.{0},'%y/%m/%d')= DATE_FORMAT('{2}','%y/%m/%d') OR DATE_FORMAT(A.{1},'%y/%m/%d')= DATE_FORMAT('{2}','%y/%m/%d')) ", nameof(RB_Student_Appointment_Extend.CreateTime), nameof(RB_Student_Appointment_Extend.AppointmentTime), Common.ConvertHelper.FormatDate(query.QueryDate));
}
if (!string.IsNullOrEmpty(query.StartDate))
{
builder.AppendFormat(" AND A.{0}>='{1}' ", nameof(RB_Student_Appointment_Extend.CreateTime), Common.ConvertHelper.FormatDate(query.StartDate));
}
if (!string.IsNullOrEmpty(query.EndDate))
{
builder.AppendFormat(" AND A.{0}<='{1} 23:59:59' ", nameof(RB_Student_Appointment_Extend.CreateTime), Common.ConvertHelper.FormatDate(query.EndDate));
}
where1+=string.Format(" AND ( DATE_FORMAT(B.{0},'%y/%m/%d')= DATE_FORMAT('{2}','%y/%m/%d') OR DATE_FORMAT(B.{1},'%y/%m/%d')= DATE_FORMAT('{2}','%y/%m/%d')) "
, nameof(RB_Student_Appointment_Extend.CreateTime)
, nameof(RB_Student_Appointment_Extend.AppointmentTime),
date);
}
return Get<RB_Student_Appointment_Extend>(builder.ToString()).ToList();
if (CreateBy > 0)
{
where1 += string.Format(" AND B.{0}={1} ", nameof(RB_Student_Appointment_Extend.CreateBy), CreateBy);
where2 += string.Format(@"
AND ( A.CreateBy IN({0})
OR A.StuId IN (SELECT StuId FROM rb_student_assist WHERE AssistId IN({0}) AND `Status`=0)
)
", CreateBy);
}
builder.AppendFormat(@"
SELECT *
FROM
(
SELECT A.*
FROM rb_student AS A INNER JOIN RB_Student_Appointment AS B ON A.StuId=B.StuId
WHERE 1=1 {0}
UNION ALL
SELECT A.*
FROM rb_student AS A
LEFT JOIN (SELECT StuId,COUNT(1) AS FollowCount FROM rb_student_follow WHERE WEEK(CreateTime,1)=WEEK(NOW(),1) GROUP BY StuId ) AS B ON A.StuId=B.StuId
WHERE 1=1 AND IFNULL(B.FollowCount,0)=0 {1}
) AS A
", where1,where2);
return GetPage<RB_Student_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString()).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