Skip to content

E
Education
Commit f211bd6d authored by liudong1993's avatar liudong1993
Browse files
Options

课耗 增加班级统计

parent 7d6d41ae
Hide whitespace changes
Inline Side-by-side
Showing with 46 additions and 23 deletions
Edu.Module.Finance/FinanceModule.cs
View file @ f211bd6d
......@@ -2393,7 +2393,7 @@ namespace Edu.Module.Finance
string userIds = string.Join(",", userList.Select(x => x.AccountId));
List<RB_Teaching_BonusDetail_ViewModel> DateList = new List<RB_Teaching_BonusDetail_ViewModel>();
//根据学生签到表 查询
var list = class_CheckRepository.GetTeacherConsumptionHoursDetialList(userIds, schoolId, startMonth, endMonth, groupId);
var list = class_CheckRepository.GetTeacherConsumptionHoursDetialList(userIds, schoolId, 0, startMonth, endMonth, groupId);
if (list.Any())
{
foreach (var item in list)
......@@ -2543,7 +2543,7 @@ namespace Edu.Module.Finance
string userIds = string.Join(",", userList.Select(x => x.AccountId));
List<RB_Teaching_BonusDetail_ViewModel> DateList = new List<RB_Teaching_BonusDetail_ViewModel>();
//根据学生签到表 查询
var list = class_CheckRepository.GetTeacherConsumptionHoursDetialList(userIds, schoolId, startMonth, endMonth, groupId);
var list = class_CheckRepository.GetTeacherConsumptionHoursDetialList(userIds, schoolId, 0, startMonth, endMonth, groupId);
if (list.Any())
{
foreach (var item in list)
......@@ -2706,18 +2706,16 @@ namespace Edu.Module.Finance
/// <param name="count"></param>
/// <param name="teacherId"></param>
/// <param name="schoolId"></param>
/// <param name="classId"></param>
/// <param name="startMonth"></param>
/// <param name="endMonth"></param>
/// <param name="studentName"></param>
/// <param name="orderId"></param>
/// <param name="contractNo"></param>
/// <param name="group_Id"></param>
/// <returns></returns>
public List<RB_Teaching_BonusDetail_ViewModel> GetTeacherConsumptionHoursDetialPageList(int pageIndex, int pageSize, out long count, int teacherId, int schoolId, string startMonth, string endMonth, int groupId)
public List<RB_Teaching_BonusDetail_ViewModel> GetTeacherConsumptionHoursDetialPageList(int pageIndex, int pageSize, out long count, int teacherId, int schoolId, int classId, string startMonth, string endMonth, int groupId)
{
List<RB_Teaching_BonusDetail_ViewModel> RList = new List<RB_Teaching_BonusDetail_ViewModel>();
//根据学生签到表 查询
var list = class_CheckRepository.GetTeacherConsumptionHoursDetialPageList(pageIndex, pageSize, out count, teacherId, schoolId, startMonth, endMonth, groupId);
var list = class_CheckRepository.GetTeacherConsumptionHoursDetialPageList(pageIndex, pageSize, out count, teacherId, schoolId, classId, startMonth, endMonth, groupId);
if (list.Any()) {
//班级类型查询
var cTypeList = class_TypeRepository.GetClassTypeListRepository(new RB_Class_Type_ViewModel() { Group_Id = groupId });
......@@ -2819,16 +2817,17 @@ namespace Edu.Module.Finance
/// </summary>
/// <param name="teacherId"></param>
/// <param name="schoolId"></param>
/// <param name="classId"></param>
/// <param name="startMonth"></param>
/// <param name="endMonth"></param>
/// <param name="groupId"></param>
/// <returns></returns>
public List<ExcelDataSource> GetTeacherConsumptionHoursDetialPageListToExcel(int teacherId, int schoolId, string startMonth, string endMonth, int groupId)
public List<ExcelDataSource> GetTeacherConsumptionHoursDetialPageListToExcel(int teacherId, int schoolId, int classId, string startMonth, string endMonth, int groupId)
{
List<ExcelDataSource> RDateList = new List<ExcelDataSource>();
List<RB_Teaching_BonusDetail_ViewModel> RList = new List<RB_Teaching_BonusDetail_ViewModel>();
//根据学生签到表 查询
var list = class_CheckRepository.GetTeacherConsumptionHoursDetialList(teacherId.ToString(), schoolId, startMonth, endMonth, groupId);
var list = class_CheckRepository.GetTeacherConsumptionHoursDetialList(teacherId.ToString(), schoolId, classId, startMonth, endMonth, groupId);
if (list.Any())
{
//班级类型查询
......@@ -2980,6 +2979,7 @@ namespace Edu.Module.Finance
/// <param name="count"></param>
/// <param name="teacherId"></param>
/// <param name="schoolId"></param>
/// <param name="classId"></param>
/// <param name="startMonth"></param>
/// <param name="endMonth"></param>
/// <param name="studentName"></param>
......@@ -2987,11 +2987,11 @@ namespace Edu.Module.Finance
/// <param name="contractNo"></param>
/// <param name="group_Id"></param>
/// <returns></returns>
public object GetStudentConsumptionHoursDetialPageList(int pageIndex, int pageSize, out long count, int teacherId, int schoolId, string startMonth, string endMonth, string studentName, int orderId, string contractNo, int groupId)
public object GetStudentConsumptionHoursDetialPageList(int pageIndex, int pageSize, out long count, int teacherId, int schoolId, int classId, string startMonth, string endMonth, string studentName, int orderId, string contractNo, int groupId)
{
List<object> RList = new List<object>();
//根据学生签到表 查询
var list = class_CheckRepository.GetStudentConsumptionHoursDetialPageList(pageIndex, pageSize, out count, teacherId, schoolId, startMonth, endMonth, studentName, orderId, contractNo, groupId);
var list = class_CheckRepository.GetStudentConsumptionHoursDetialPageList(pageIndex, pageSize, out count, teacherId, schoolId, classId, startMonth, endMonth, studentName, orderId, contractNo, groupId);
if (list.Any())
{
//查询关联销售
......@@ -3042,6 +3042,7 @@ namespace Edu.Module.Finance
/// </summary>
/// <param name="teacherId"></param>
/// <param name="schoolId"></param>
/// <param name="classId"></param>
/// <param name="startMonth"></param>
/// <param name="endMonth"></param>
/// <param name="studentName"></param>
......@@ -3049,11 +3050,11 @@ namespace Edu.Module.Finance
/// <param name="contractNo"></param>
/// <param name="groupId"></param>
/// <returns></returns>
public List<ExcelDataSource> GetStudentConsumptionHoursDetialPageListToExcel(int teacherId, int schoolId, string startMonth, string endMonth, string studentName, int orderId, string contractNo, int groupId)
public List<ExcelDataSource> GetStudentConsumptionHoursDetialPageListToExcel(int teacherId, int schoolId, int classId, string startMonth, string endMonth, string studentName, int orderId, string contractNo, int groupId)
{
List<ExcelDataSource> RList = new List<ExcelDataSource>();
//根据学生签到表 查询
var list = class_CheckRepository.GetStudentConsumptionHoursDetialList(teacherId, schoolId, startMonth, endMonth, studentName, orderId, contractNo, groupId);
var list = class_CheckRepository.GetStudentConsumptionHoursDetialList(teacherId, schoolId, classId, startMonth, endMonth, studentName, orderId, contractNo, groupId);
if (list.Any())
{
//查询关联销售
......
Edu.Repository/Course/RB_Class_CheckRepository.cs
View file @ f211bd6d
......@@ -419,11 +419,12 @@ GROUP BY tt.TeacherId,tt.OrderGuestId
/// <param name="count"></param>
/// <param name="teacherId"></param>
/// <param name="schoolId"></param>
/// <param name="classId"></param>
/// <param name="startMonth"></param>
/// <param name="endMonth"></param>
/// <param name="group_Id"></param>
/// <returns></returns>
public List<RB_Class_Check_ViewModel> GetTeacherConsumptionHoursDetialPageList(int pageIndex, int pageSize, out long count, int teacherId, int schoolId, string startMonth, string endMonth, int group_Id)
public List<RB_Class_Check_ViewModel> GetTeacherConsumptionHoursDetialPageList(int pageIndex, int pageSize, out long count, int teacherId, int schoolId, int classId, string startMonth, string endMonth, int group_Id)
{
string where = $@" ";
if (teacherId > 0) {
......@@ -432,6 +433,9 @@ GROUP BY tt.TeacherId,tt.OrderGuestId
if (schoolId >= 0) {
where += $@" and t2.School_Id ={schoolId}";
}
if (classId > 0) {
where += $@" and p.ClassId ={classId}";
}
string sql = $@"
SELECT p.TeacherId,t2.TeacherName,t2.BaseHourFee,c.ClassName,co.CourseName,p.ClassId,c.ClassType,c.ClassHourMinute,c.CouseId,p.ClassDate,p.ClassTimeId,t.StartTime as StartDate,t.EndTime as EndDate FROM rb_class_check p
......@@ -449,16 +453,17 @@ ORDER BY p.ClassDate ASC
/// <summary>
/// 获取老师课时统计明细
/// </summary>
/// <param name="teacherId"></param>
/// <param name="teacherIds"></param>
/// <param name="schoolId"></param>
/// <param name="classId"></param>
/// <param name="startMonth"></param>
/// <param name="endMonth"></param>
/// <param name="group_Id"></param>
/// <returns></returns>
public List<RB_Class_Check_ViewModel> GetTeacherConsumptionHoursDetialList(string teacherIds, int schoolId, string startMonth, string endMonth, int group_Id)
public List<RB_Class_Check_ViewModel> GetTeacherConsumptionHoursDetialList(string teacherIds, int schoolId, int classId, string startMonth, string endMonth, int group_Id)
{
string where = $@" ";
if (!string.IsNullOrEmpty(teacherIds))
if (!string.IsNullOrEmpty(teacherIds) && teacherIds != "-1" && teacherIds != "0")
{
where += $@" and p.TeacherId in({teacherIds})";
}
......@@ -466,6 +471,9 @@ ORDER BY p.ClassDate ASC
{
where += $@" and t2.School_Id ={schoolId}";
}
if (classId > 0) {
where += $@" and p.ClassId ={classId}";
}
string sql = $@"
SELECT p.TeacherId,t2.TeacherName,t2.BaseHourFee,c.ClassName,co.CourseName,p.ClassId,c.ClassType,c.ClassHourMinute,c.CouseId,p.ClassDate,p.ClassTimeId,t.StartTime as StartDate,t.EndTime as EndDate FROM rb_class_check p
......@@ -488,6 +496,7 @@ ORDER BY p.ClassDate ASC
/// <param name="count"></param>
/// <param name="teacherId"></param>
/// <param name="schoolId"></param>
/// <param name="classId"></param>
/// <param name="startMonth"></param>
/// <param name="endMonth"></param>
/// <param name="studentName"></param>
......@@ -495,7 +504,7 @@ ORDER BY p.ClassDate ASC
/// <param name="contractNo"></param>
/// <param name="groupId"></param>
/// <returns></returns>
public List<RB_Class_Check_ViewModel> GetStudentConsumptionHoursDetialPageList(int pageIndex, int pageSize, out long count, int teacherId, int schoolId, string startMonth, string endMonth, string studentName, int orderId, string contractNo, int groupId)
public List<RB_Class_Check_ViewModel> GetStudentConsumptionHoursDetialPageList(int pageIndex, int pageSize, out long count, int teacherId, int schoolId, int classId, string startMonth, string endMonth, string studentName, int orderId, string contractNo, int groupId)
{
string where = $@" ";
if (teacherId > 0)
......@@ -506,6 +515,10 @@ ORDER BY p.ClassDate ASC
{
where += $@" and t2.School_Id ={schoolId}";
}
if (classId > 0)
{
where += $@" and p.ClassId ={classId}";
}
if (!string.IsNullOrEmpty(studentName))
{
where += $@" and t2.GuestName like '%{studentName}%'";
......@@ -553,6 +566,7 @@ ORDER BY tt.ClassDate ASC
/// </summary>
/// <param name="teacherId"></param>
/// <param name="schoolId"></param>
/// <param name="classId"></param>
/// <param name="startMonth"></param>
/// <param name="endMonth"></param>
/// <param name="studentName"></param>
......@@ -560,7 +574,7 @@ ORDER BY tt.ClassDate ASC
/// <param name="contractNo"></param>
/// <param name="groupId"></param>
/// <returns></returns>
public List<RB_Class_Check_ViewModel> GetStudentConsumptionHoursDetialList(int teacherId, int schoolId, string startMonth, string endMonth, string studentName, int orderId, string contractNo, int groupId)
public List<RB_Class_Check_ViewModel> GetStudentConsumptionHoursDetialList(int teacherId, int schoolId, int classId, string startMonth, string endMonth, string studentName, int orderId, string contractNo, int groupId)
{
string where = $@" ";
if (teacherId > 0)
......@@ -571,6 +585,10 @@ ORDER BY tt.ClassDate ASC
{
where += $@" and t2.School_Id ={schoolId}";
}
if (classId > 0)
{
where += $@" and p.ClassId ={classId}";
}
if (!string.IsNullOrEmpty(studentName))
{
where += $@" and t2.GuestName like '%{studentName}%'";
......
Edu.WebApi/Controllers/Finance/FinanceController.cs
View file @ f211bd6d
......@@ -1545,6 +1545,7 @@ namespace Edu.WebApi.Controllers.Finance
var pageModel = JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
int TeacherId = base.ParmJObj.GetInt("TeacherId", 0);
int SchoolId = base.ParmJObj.GetInt("SchoolId", 0);
int ClassId = base.ParmJObj.GetInt("ClassId", 0);
string StartMonth = base.ParmJObj.GetStringValue("StartMonth");
string EndMonth = base.ParmJObj.GetStringValue("EndMonth");
if (string.IsNullOrEmpty(StartMonth))
......@@ -1565,7 +1566,7 @@ namespace Edu.WebApi.Controllers.Finance
return ApiResult.Failed("日期格式有误");
}
var list = financeModule.GetTeacherConsumptionHoursDetialPageList(pageModel.PageIndex, pageModel.PageSize, out long count, TeacherId, SchoolId, StartMonth, EndMonth, userInfo.Group_Id);
var list = financeModule.GetTeacherConsumptionHoursDetialPageList(pageModel.PageIndex, pageModel.PageSize, out long count, TeacherId, SchoolId, ClassId, StartMonth, EndMonth, userInfo.Group_Id);
pageModel.Count = Convert.ToInt32(count);
pageModel.PageData = list.Select(x => new
{
......@@ -1619,6 +1620,7 @@ namespace Edu.WebApi.Controllers.Finance
var pageModel = JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
int TeacherId = base.ParmJObj.GetInt("TeacherId", 0);
int SchoolId = base.ParmJObj.GetInt("SchoolId", 0);
int ClassId = base.ParmJObj.GetInt("ClassId", 0);
string StartMonth = base.ParmJObj.GetStringValue("StartMonth");
string EndMonth = base.ParmJObj.GetStringValue("EndMonth");
if (string.IsNullOrEmpty(StartMonth))
......@@ -1642,7 +1644,7 @@ namespace Edu.WebApi.Controllers.Finance
return File(byteData1, "application/octet-stream", ExcelName);
}
var list = financeModule.GetTeacherConsumptionHoursDetialPageListToExcel(TeacherId, SchoolId, StartMonth, EndMonth, userInfo.Group_Id);
var list = financeModule.GetTeacherConsumptionHoursDetialPageListToExcel(TeacherId, SchoolId, ClassId, StartMonth, EndMonth, userInfo.Group_Id);
try
{
......@@ -1673,6 +1675,7 @@ namespace Edu.WebApi.Controllers.Finance
var pageModel = JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
int TeacherId = base.ParmJObj.GetInt("TeacherId", 0);
int SchoolId = base.ParmJObj.GetInt("SchoolId", 0);
int ClassId = base.ParmJObj.GetInt("ClassId", 0);
string StartMonth = base.ParmJObj.GetStringValue("StartMonth");
string EndMonth = base.ParmJObj.GetStringValue("EndMonth");
string StudentName = base.ParmJObj.GetStringValue("StudentName");//学生名称
......@@ -1696,7 +1699,7 @@ namespace Edu.WebApi.Controllers.Finance
return ApiResult.Failed("日期格式有误");
}
var list = financeModule.GetStudentConsumptionHoursDetialPageList(pageModel.PageIndex, pageModel.PageSize, out long count, TeacherId, SchoolId, StartMonth, EndMonth, StudentName, OrderId, ContractNo, userInfo.Group_Id);
var list = financeModule.GetStudentConsumptionHoursDetialPageList(pageModel.PageIndex, pageModel.PageSize, out long count, TeacherId, SchoolId, ClassId, StartMonth, EndMonth, StudentName, OrderId, ContractNo, userInfo.Group_Id);
pageModel.Count = Convert.ToInt32(count);
pageModel.PageData = list;
return ApiResult.Success("", pageModel);
......@@ -1736,6 +1739,7 @@ namespace Edu.WebApi.Controllers.Finance
var pageModel = JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
int TeacherId = base.ParmJObj.GetInt("TeacherId", 0);
int SchoolId = base.ParmJObj.GetInt("SchoolId", 0);
int ClassId = base.ParmJObj.GetInt("ClassId", 0);
string StartMonth = base.ParmJObj.GetStringValue("StartMonth");
string EndMonth = base.ParmJObj.GetStringValue("EndMonth");
string StudentName = base.ParmJObj.GetStringValue("StudentName");//学生名称
......@@ -1762,7 +1766,7 @@ namespace Edu.WebApi.Controllers.Finance
return File(byteData1, "application/octet-stream", ExcelName);
}
var list = financeModule.GetStudentConsumptionHoursDetialPageListToExcel(TeacherId, SchoolId, StartMonth, EndMonth, StudentName, OrderId, ContractNo, userInfo.Group_Id);
var list = financeModule.GetStudentConsumptionHoursDetialPageListToExcel(TeacherId, SchoolId, ClassId, StartMonth, EndMonth, StudentName, OrderId, ContractNo, userInfo.Group_Id);
try
{
......
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