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