wgh/coreshoppro
1
0
Fork 0
mirror of http://git.coreshop.cn/jianweie/coreshoppro.git synced 2025-12-06 16:13:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

【修复】修复mysql下报表统计异常问题，优化显示数量问题。

Browse Source
This commit is contained in:
jianweie code
2023-03-06 23:37:25 +08:00
parent 36674d1db0
commit 3d8a6b3ec8
5 changed files with 42 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
CoreCms.Net.Utility/Helper/CommonHelper.cs
View File

@@ -733,5 +733,19 @@ namespace CoreCms.Net.Utility.Helper
// 如果上传文件大于限定的容量
return !(fileSize > size);
}
/// <summary>
/// 10位时间戳 转化
/// </summary>
/// <param name="time"></param>
/// <returns></returns>
public static long ConvertDateTimeToInt(System.DateTime time)
{
System.DateTime startTime = TimeZone.CurrentTimeZone.ToLocalTime(new System.DateTime(1970, 1, 1, 0, 0, 0, 0));
long t = (time.Ticks - startTime.Ticks) / 10000000; //除10000000调整为10位
return t;
}
}
}

12
CoreCms.Net.Utility/Helper/ReportsHelper.cs
View File

@@ -110,29 +110,29 @@ namespace CoreCms.Net.Utility.Helper
case 3600: //小时
if (dateArr.num <= 24)
{
xType = "H时";
xType = "d日H时";
}
else if (dateArr.num <= 720)
{
xType = "d日H时";
xType = "M月d日H时";
}
else
{
xType = "m月d日H时";
xType = "M月d日H时";
}
break;
case 86400: //天
if (dateArr.num <= 31)
{
xType = "d号";
xType = "M月d号";
}
else if (dateArr.num <= 365)
{
xType = "m.d";
xType = "yyyy年M月dd日";
}
else
{
xType = "Y.m.d";
xType = "yyyy年M月dd日";
}
break;
}