Skip to content

E
Education
Commit 5a8b0f44 authored by 吴春's avatar 吴春
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

parents 399dc3ca c57dc571
Show whitespace changes
Inline Side-by-side
Showing with 135 additions and 12 deletions
Edu.Common/Plugin/ConvertHelper.cs
View file @ 5a8b0f44
......@@ -381,5 +381,77 @@ namespace Edu.Common
}
return age < 0 ? 0 : age;
}
/// <summary>
/// 获取最近一个星期一
/// </summary>
/// <param name="objDate"></param>
/// <returns></returns>
public static string GetWeekMonday(string objDate)
{
DateTime date = Convert.ToDateTime(objDate);
DateTime first = System.DateTime.Now;
switch (date.DayOfWeek)
{
case System.DayOfWeek.Monday:
first = date;
break;
case System.DayOfWeek.Tuesday:
first = date.AddDays(-1);
break;
case System.DayOfWeek.Wednesday:
first = date.AddDays(-2);
break;
case System.DayOfWeek.Thursday:
first = date.AddDays(-3);
break;
case System.DayOfWeek.Friday:
first = date.AddDays(-4);
break;
case System.DayOfWeek.Saturday:
first = date.AddDays(-5);
break;
case System.DayOfWeek.Sunday:
first = date.AddDays(-6);
break;
}
return FormatDate(first);
}
/// <summary>
/// 获取最近一个星期天
/// </summary>
/// <param name="objDate"></param>
/// <returns></returns>
public static string GetWeekSunday(string objDate)
{
DateTime date = Convert.ToDateTime(objDate);
DateTime last = Convert.ToDateTime(objDate);
switch (date.DayOfWeek)
{
case System.DayOfWeek.Monday:
last = date.AddDays(6);
break;
case System.DayOfWeek.Tuesday:
last = date.AddDays(5);
break;
case System.DayOfWeek.Wednesday:
last = date.AddDays(4);
break;
case System.DayOfWeek.Thursday:
last = date.AddDays(3);
break;
case System.DayOfWeek.Friday:
last = date.AddDays(2);
break;
case System.DayOfWeek.Saturday:
last = date.AddDays(1);
break;
case System.DayOfWeek.Sunday:
last = date;
break;
}
return FormatDate(last);
}
}
}
\ No newline at end of file
Edu.Module.Course/ClassModule.cs
View file @ 5a8b0f44
......@@ -2014,9 +2014,15 @@ namespace Edu.Module.Course
/// <returns></returns>
public object GetClassPlanStatisticalModule(RB_Class_Plan_ViewModel query)
{
List<object> result = new List<object>();
var startTime = Convert.ToDateTime(query.StartTime);
var endTime = Convert.ToDateTime(query.EndTime);
List<object> mondayList = new List<object>();
List<object> tuesdayList = new List<object>();
List<object> wednesdayList = new List<object>();
List<object> thursdayList = new List<object>();
List<object> fridayList = new List<object>();
List<object> saturdayList = new List<object>();
List<object> sundayList = new List<object>();
var startTime = Convert.ToDateTime(Common.ConvertHelper.GetWeekMonday(query.StartTime));
var endTime = Convert.ToDateTime(Common.ConvertHelper.GetWeekSunday(query.EndTime));
TimeSpan sp = endTime.Subtract(startTime);
var days = sp.Days+1;
var list = class_PlanRepository.GetClassPlanStatisticalRepository(query);
......@@ -2052,10 +2058,33 @@ namespace Edu.Module.Course
WeekStr = Common.ConvertHelper.GetWeekDay(ClassDate),
SubList = subList
};
result.Add(obj);
switch (ClassDate.DayOfWeek)
{
case DayOfWeek.Monday:
mondayList.Add(obj);
break;
case DayOfWeek.Tuesday:
tuesdayList.Add(obj);
break;
case DayOfWeek.Wednesday:
wednesdayList.Add(obj);
break;
case DayOfWeek.Thursday:
thursdayList.Add(obj);
break;
case DayOfWeek.Friday:
fridayList.Add(obj);
break;
case DayOfWeek.Saturday:
saturdayList.Add(obj);
break;
case DayOfWeek.Sunday:
sundayList.Add(obj);
break;
}
}
return result;
}
return new { mondayList , tuesdayList , wednesdayList ,thursdayList, fridayList, saturdayList, sundayList };
}
/// <summary>
......
Edu.Module.Course/OrderModule.cs
View file @ 5a8b0f44
......@@ -182,7 +182,7 @@ namespace Edu.Module.Course
string k2classIds = string.Join(",", list.Where(x => x.ClassStyle == Common.Enum.Course.ClassStyleEnum.FixedDate).Select(x => x.ClassId));
if (!string.IsNullOrEmpty(k2classIds))
{
PlanFixed = class_PlanRepository.GetClassPlanListExtRepository(new RB_Class_Plan_ViewModel() { QClassIds = k2classIds });
PlanFixed = class_PlanRepository.GetClassPlanListRepository(new RB_Class_Plan_ViewModel() { QClassIds = k2classIds });
}
foreach (var item in list)
{
......
Edu.Module.Duty/DutyPlanModule.cs
View file @ 5a8b0f44
......@@ -133,11 +133,11 @@ namespace Edu.Module.Duty
{
var dutyItem = dutyItemList?.Where(qitem => qitem.Shifts.Contains(subItem.Shift.ToString()) && qitem.Id == dItem.ItemId && qitem.ItemSchools.Contains(item.School_Id.ToString()))?.FirstOrDefault();
int isFinish = 0;
if (dutyItem.ItemType == ItemTypeEnum.Choice)
if (dutyItem!=null&&dutyItem.ItemType == ItemTypeEnum.Choice)
{
isFinish = dItem.WorkIsFinish;
}
else if (dutyItem.ItemType == ItemTypeEnum.FillIn)
else if (dutyItem!=null&&dutyItem.ItemType == ItemTypeEnum.FillIn)
{
if (!string.IsNullOrEmpty(dItem.WorkContent))
{
......
Edu.Repository/Course/RB_Class_PlanRepository.cs
View file @ 5a8b0f44
......@@ -470,7 +470,7 @@ where sog.Account_Id={query.StuId} and c.ClassStatus in(1,2) and c.`Status`=0 an
public List<RB_Class_Plan_ViewModel> GetClassPlanStatisticalRepository(RB_Class_Plan_ViewModel query)
{
StringBuilder where = new StringBuilder();
where.AppendFormat(" AND B.ClassStatus NOT IN(1,4) ");
if (query != null)
{
if (query.Group_Id > 0)
......@@ -502,7 +502,7 @@ FROM
(
SELECT A.ClassPlanId, A.ClassId,A.ClassDate,A.ClassRoomId,B.ClassName,C.CourseName,B.Teacher_Id,IFNULL(D.TeacherName,'') AS TeacherName,E.RoomName
,TIMESTAMPDIFF(MINUTE, CONCAT('2020-12-16',' ',F.StartTime), CONCAT('2020-12-16',' ',F.EndTime)) AS minNum,F.StartTime,F.EndTime
FROM rb_class_plan AS A LEFT JOIN rb_class AS B ON A.ClassId=B.ClassId
FROM rb_class_plan AS A INNER JOIN rb_class AS B ON A.ClassId=B.ClassId
LEFT JOIN rb_course AS C ON B.CouseId=C.CourseId
LEFT JOIN rb_teacher AS D ON B.Teacher_Id=D.TId
LEFT JOIN rb_class_room AS E ON A.ClassRoomId=E.RoomId
......
Edu.WebApi/Controllers/Course/ClassController.cs
View file @ 5a8b0f44
......@@ -1852,6 +1852,27 @@ namespace Edu.WebApi.Controllers.Course
{
var startDate = base.ParmJObj.GetStringValue("StartTime");
var endDate = base.ParmJObj.GetStringValue("EndTime");
DateTime now = DateTime.Now;
//获取当前月的第一天
DateTime d1 = new DateTime(now.Year, now.Month, 1);
//当月最后一天
DateTime d2 = d1.AddMonths(1).AddDays(-1);
if (string.IsNullOrEmpty(startDate))
{
startDate = Common.ConvertHelper.FormatDate(d1);
}
if (string.IsNullOrEmpty(endDate))
{
endDate = Common.ConvertHelper.FormatDate(d2);
}
else
{
//if (Convert.ToDateTime(endDate) > Convert.ToDateTime(Common.ConvertHelper.FormatDate(DateTime.Now)))
//{
// endDate = Common.ConvertHelper.FormatDate(DateTime.Now);
//}
}
RB_Class_Plan_ViewModel query = new RB_Class_Plan_ViewModel()
{
StartTime = startDate,
......
Edu.WebApi/Controllers/Duty/DutyPlanController.cs
View file @ 5a8b0f44
......@@ -283,6 +283,7 @@ namespace Edu.WebApi.Controllers.Duty
{
UserId = DutyMan;
}
UserId = 0;
var obj = dutyPlanModule.OnDutyModule(Id, Shift, UserId, isQueryWork:true);
return ApiResult.Success(data: obj);
}
......
Edu.WebApi/appsettings.json
View file @ 5a8b0f44
{
"ConnectionStrings": {
"DefaultConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_edu;CharSet=utf8mb4; Convert Zero Datetime=true; ",
"DefaultConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=test_edu;CharSet=utf8mb4; Convert Zero Datetime=true; ",
"DefaultConnectionPName": "MySql.Data.MySqlClient",
"FinanceConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=test_reborn_finance;CharSet=utf8mb4; Convert Zero Datetime=true; ",
"FinanceConnectionPName": "MySql.Data.MySqlClient",
......
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