|
@@ -574,10 +574,10 @@ namespace TEAMModelOS.SDK.Models.Service.BI
|
|
|
var (lastTermS, lastTermE) = TimeHelper.GetStartOrEnd(dateOff, "lastterm"); //计算上学期开始/结束时间
|
|
|
var (termS, termE) = TimeHelper.GetStartOrEnd(dateOff, "term"); //计算本学期开始/结束时间
|
|
|
|
|
|
- var (weekDayS, weekDayE) = TimeHelper.GetLongToTime(weekS, weekE);
|
|
|
var (lWeekDayS, lWeekDayE) = TimeHelper.GetLongToTime(lastWeekS, lastWeekE);
|
|
|
+ var (weekDayS, weekDayE) = TimeHelper.GetLongToTime(weekS, weekE);
|
|
|
var (lTermDayS, lTermDayE) = TimeHelper.GetLongToTime(lastTermS, lastTermE);
|
|
|
- var (termDayS, termDayE) = TimeHelper.GetLongToTime(lastTermS, lastTermE);
|
|
|
+ var (termDayS, termDayE) = TimeHelper.GetLongToTime(termS, termE);
|
|
|
var (lMonthS, lMonthE) = TimeHelper.GetLongToTime(lastMonthS, lastMonthE);
|
|
|
var (monthDayS, monthDayE) = TimeHelper.GetLongToTime(monthS, monthE);
|
|
|
var lastDay = dateOff.AddDays(-1);
|