Skip to content

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

11

parent 68a653f0
Hide whitespace changes
Inline Side-by-side
Showing with 63 additions and 32 deletions
Edu.Module.Course/ClassModule.cs
View file @ 1f042ce0
......@@ -26,6 +26,7 @@ using Edu.Repository.Scroll;
using Edu.Repository.Sell;
using Edu.Repository.User;
using Microsoft.AspNetCore.SignalR;
using Senparc.Weixin.Work.AdvancedAPIs.OaDataOpen;
using System;
using System.Collections.Generic;
using System.Linq;
......@@ -3344,7 +3345,7 @@ namespace Edu.Module.Course
});
}
appointList.Where(x => x.Date == ClassDate).GroupBy(x => new { x.Date, x.TeacherId, x.TeacherName, x.RoomId, x.RoomName, x.CourseName, x.CourseGradeId, x.CourseGradeNo, x.CourseSTime }).OrderBy(x => x.Key.CourseSTime).ToList().ForEach(item =>
appointList.Where(x => x.Date == ClassDate).GroupBy(x => new { x.Date, x.TeacherId, x.TeacherName, x.RoomId, x.RoomName, x.CourseName, x.CourseGradeId, x.ShiftSort, x.CourseSTime }).OrderBy(x => x.Key.CourseSTime).ToList().ForEach(item =>
{
//上课时段
string STime = item.FirstOrDefault().CourseSTime ?? "", ETime = item.FirstOrDefault().CourseETime ?? "";
......@@ -3358,7 +3359,7 @@ namespace Edu.Module.Course
item.Key.CourseName,
item.Key.RoomName,
item.Key.TeacherName,
Ranks = item.Key.CourseGradeNo,
Ranks = item.Key.ShiftSort,
CourseGradeIdName = item.Key.CourseGradeId.ToName(),
TotalPlanNum = item.FirstOrDefault().TotalChapterNo,
TimeStr = Common.ConvertHelper.GetTimeStr(currentDate),
......@@ -3927,37 +3928,52 @@ namespace Edu.Module.Course
subItem.School_Id,
});
}
if (Common.ConvertHelper.FormatDate(ClassDate) == "2024-11-06")
{
string str = "";
}
//约课
appointList.Where(x => x.Date == ClassDate).GroupBy(x => new { x.Date, x.TeacherId, x.TeacherName, x.RoomId, x.RoomName, x.CourseName, x.CourseGradeNo, x.CourseGradeId, x.CourseSTime }).OrderBy(x => x.Key.CourseSTime).ToList().ForEach(item =>
{
//上课时段
string STime = item.FirstOrDefault().CourseSTime ?? "", ETime = item.FirstOrDefault().CourseETime ?? "";
var currentDate = Common.ConvertHelper.FormatDate(ClassDate) + " " + STime;
subList.Add(new
{
Id = 0,
ClassType = 3,
ClassId = 0,
ClassName = "约课",
item.Key.CourseName,
item.Key.RoomName,
item.Key.TeacherName,
Ranks = item.Key.CourseGradeNo,
CourseGradeIdName = item.Key.CourseGradeId.ToName(),
TotalPlanNum = item.FirstOrDefault().TotalChapterNo,
TimeStr = Common.ConvertHelper.GetTimeStr(currentDate),
StartTime = STime,
EndTime = ETime,
CompleteProgress = -1,
FeedBackStatus = 0,
GuestList = item.Select(qitem => new { GuestName = qitem.StuName, qitem.AppointType }),
AppointState = item.Where(x => x.State == CourseAppointStateEnum.WaitSure).Any() ? 1 : 2,
item.FirstOrDefault().ScrollMinNum,
item.FirstOrDefault()?.ClassPlanId,
School_Id = 0,
});
});
var tempAppointList = appointList.Where(x => x.Date == ClassDate).GroupBy(x => new
{
x.Date,
x.TeacherId,
x.TeacherName,
x.RoomId,
x.RoomName,
x.CourseName,
x.ShiftSort,
x.CourseGradeId,
x.CourseSTime
}).OrderBy(x => x.Key.CourseSTime).ToList();
foreach (var item in tempAppointList)
{
//上课时段
string STime = item.FirstOrDefault().CourseSTime ?? "", ETime = item.FirstOrDefault().CourseETime ?? "";
var currentDate = Common.ConvertHelper.FormatDate(ClassDate) + " " + STime;
subList.Add(new
{
Id = 0,
ClassType = 3,
ClassId = 0,
ClassName = "约课",
item.Key.CourseName,
item.Key.RoomName,
item.Key.TeacherName,
Ranks = item.Key.ShiftSort,
CourseGradeIdName = item.Key.CourseGradeId.ToName(),
TotalPlanNum = item.FirstOrDefault().TotalChapterNo,
TimeStr = Common.ConvertHelper.GetTimeStr(currentDate),
StartTime = STime,
EndTime = ETime,
CompleteProgress = -1,
FeedBackStatus = 0,
GuestList = item.Select(qitem => new { GuestName = qitem.StuName, qitem.AppointType }),
AppointState = item.Where(x => x.State == CourseAppointStateEnum.WaitSure).Any() ? 1 : 2,
item.FirstOrDefault().ScrollMinNum,
item.FirstOrDefault()?.ClassPlanId,
School_Id = 0,
});
}
var obj = new
{
......
Edu.WebApi/Controllers/Course/ClassController.cs
View file @ 1f042ce0
......@@ -2881,7 +2881,22 @@ namespace Edu.WebApi.Controllers.Course
foreach (var gItem in guestList)
{
JObject gObj = JObject.Parse(gItem.ToString());
string AppointTypeStr = "";
int AppointType = gObj.GetInt("AppointType");
if (AppointType == 2)
{
AppointTypeStr = "补课";
}
if (AppointType == 3)
{
AppointTypeStr = "重修";
}
guestStr += "/" + gObj["GuestName"].ToString();
if (!string.IsNullOrEmpty(AppointTypeStr))
{
guestStr += string.Format("【{0}】", AppointTypeStr);
}
}
}
var dataRow = new List<ExcelColumn>(30)
......
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