|
@@ -188,19 +188,19 @@ namespace TEAMModelBI.Tool
|
|
|
int month = dateTime.Month;
|
|
|
int day = dateTime.Day;
|
|
|
DateTimeOffset tempStrart = new();
|
|
|
- DateTimeOffset tempEnt = new();
|
|
|
+ DateTimeOffset tempEnd = new();
|
|
|
switch (type)
|
|
|
{
|
|
|
case "year":
|
|
|
tempStrart = new DateTime(year, 1, 1);
|
|
|
- tempEnt = new DateTime(year, 12, DateTime.DaysInMonth(year, 12), 23, 59, 59);
|
|
|
+ tempEnd = new DateTime(year, 12, DateTime.DaysInMonth(year, 12), 23, 59, 59);
|
|
|
break;
|
|
|
|
|
|
case "term":
|
|
|
if (month <= 8 && month >= 3)
|
|
|
{
|
|
|
tempStrart = new DateTime(year, 3, 1);
|
|
|
- tempEnt = new DateTime(year, 8, 31, 23, 59, 59);
|
|
|
+ tempEnd = new DateTime(year, 8, 31, 23, 59, 59);
|
|
|
}
|
|
|
else
|
|
|
{
|
|
@@ -209,11 +209,11 @@ namespace TEAMModelBI.Tool
|
|
|
if (month >= 9)
|
|
|
{
|
|
|
tempStrart = new DateTime(year, 9, 1);
|
|
|
- tempEnt = new DateTime(year + 1, 2, (year % 4 == 0 && year % 100 != 0 || year % 400 == 0) ? days = 29 : days = 28, 23, 59, 59); }
|
|
|
+ tempEnd = new DateTime(year + 1, 2, (year % 4 == 0 && year % 100 != 0 || year % 400 == 0) ? days = 29 : days = 28, 23, 59, 59); }
|
|
|
else
|
|
|
{
|
|
|
tempStrart = new DateTime(year - 1, 9, 1);
|
|
|
- tempEnt = new DateTime(year, 2, (year % 4 == 0 && year % 100 != 0 || year % 400 == 0) ? days = 29 : days = 28, 23, 59, 59);
|
|
|
+ tempEnd = new DateTime(year, 2, (year % 4 == 0 && year % 100 != 0 || year % 400 == 0) ? days = 29 : days = 28, 23, 59, 59);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -230,7 +230,7 @@ namespace TEAMModelBI.Tool
|
|
|
if (month <= 8 && month >= 3)
|
|
|
{
|
|
|
tempStrart = new DateTime(year, 3, 1);
|
|
|
- tempEnt = new DateTime(year, 8, 31, 23, 59, 59);
|
|
|
+ tempEnd = new DateTime(year, 8, 31, 23, 59, 59);
|
|
|
}
|
|
|
else
|
|
|
{
|
|
@@ -239,12 +239,12 @@ namespace TEAMModelBI.Tool
|
|
|
if (month >= 9)
|
|
|
{
|
|
|
tempStrart = new DateTime(year, 9, 1);
|
|
|
- tempEnt = new DateTime(year + 1, 2, (year % 4 == 0 && year % 100 != 0 || year % 400 == 0) ? days = 29 : days = 28, 23, 59, 59);
|
|
|
+ tempEnd = new DateTime(year + 1, 2, (year % 4 == 0 && year % 100 != 0 || year % 400 == 0) ? days = 29 : days = 28, 23, 59, 59);
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
tempStrart = new DateTime(year - 1, 9, 1);
|
|
|
- tempEnt = new DateTime(year, 2, (year % 4 == 0 && year % 100 != 0 || year % 400 == 0) ? days = 29 : days = 28, 23, 59, 59);
|
|
|
+ tempEnd = new DateTime(year, 2, (year % 4 == 0 && year % 100 != 0 || year % 400 == 0) ? days = 29 : days = 28, 23, 59, 59);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -252,14 +252,14 @@ namespace TEAMModelBI.Tool
|
|
|
break;
|
|
|
case "month":
|
|
|
tempStrart = new DateTime(year, month, 1);
|
|
|
- tempEnt = new DateTime(year, month, DateTime.DaysInMonth(year, month), 23, 59, 59);
|
|
|
+ tempEnd = new DateTime(year, month, DateTime.DaysInMonth(year, month), 23, 59, 59);
|
|
|
|
|
|
break;
|
|
|
case "week":
|
|
|
DateTimeOffset weekStrart = dateTime.AddDays(-(int)(dateTime.DayOfWeek) + 1);
|
|
|
DateTimeOffset weekEnd = dateTime.AddDays(7-(int)(dateTime.DayOfWeek));
|
|
|
tempStrart = new DateTime(weekStrart.Year, weekStrart.Month, weekStrart.Day);
|
|
|
- tempEnt = new DateTime(weekEnd.Year, weekEnd.Month, weekEnd.Day, 23, 59, 59);
|
|
|
+ tempEnd = new DateTime(weekEnd.Year, weekEnd.Month, weekEnd.Day, 23, 59, 59);
|
|
|
|
|
|
break;
|
|
|
case "lastweek":
|
|
@@ -268,24 +268,24 @@ namespace TEAMModelBI.Tool
|
|
|
var Mon = dateTime.AddDays((-7 - m));//星期一
|
|
|
var Sun = dateTime.AddDays((-7 - s)); //星期日
|
|
|
tempStrart = new DateTime(Mon.Year, Mon.Month, Mon.Day);
|
|
|
- tempEnt = new DateTime(Sun.Year, Sun.Month, Sun.Day, 23, 59, 59);
|
|
|
+ tempEnd = new DateTime(Sun.Year, Sun.Month, Sun.Day, 23, 59, 59);
|
|
|
|
|
|
break;
|
|
|
default:
|
|
|
tempStrart = new DateTime(year, month, day);
|
|
|
- tempEnt = new DateTime(year, month, day, 23, 59, 59);
|
|
|
+ tempEnd = new DateTime(year, month, day, 23, 59, 59);
|
|
|
//start = dateLenth ? DateTimeOffset.Parse($"{dayStart}").ToUnixTimeMilliseconds() : DateTimeOffset.Parse($"{dayStart}").ToUnixTimeSeconds();
|
|
|
//end = dateLenth ? DateTimeOffset.Parse($"{dayEnd}").ToUnixTimeMilliseconds() : DateTimeOffset.Parse($"{dayEnd}").ToUnixTimeSeconds();
|
|
|
break;
|
|
|
}
|
|
|
|
|
|
start = dateLenth ? DateTimeOffset.Parse($"{tempStrart}").ToUnixTimeMilliseconds() : DateTimeOffset.Parse($"{tempStrart}").ToUnixTimeSeconds();
|
|
|
- end = dateLenth ? DateTimeOffset.Parse($"{tempEnt}").ToUnixTimeMilliseconds() : DateTimeOffset.Parse($"{tempEnt}").ToUnixTimeSeconds();
|
|
|
+ end = dateLenth ? DateTimeOffset.Parse($"{tempEnd}").ToUnixTimeMilliseconds() : DateTimeOffset.Parse($"{tempEnd}").ToUnixTimeSeconds();
|
|
|
|
|
|
return (start, end);
|
|
|
-
|
|
|
}
|
|
|
|
|
|
|
|
|
+
|
|
|
}
|
|
|
}
|