diff --git a/CoreCms.Net.Services/Financial/CoreCmsReportsServices.cs b/CoreCms.Net.Services/Financial/CoreCmsReportsServices.cs index f100c0e6..36ed5927 100644 --- a/CoreCms.Net.Services/Financial/CoreCmsReportsServices.cs +++ b/CoreCms.Net.Services/Financial/CoreCmsReportsServices.cs @@ -85,7 +85,8 @@ namespace CoreCms.Net.Services where 1 = 1 " + where + @" ) o on tmp_x.x = ((unix_timestamp(o." + joinVal + @") - " + CommonHelper.ConvertDateTimeToInt(sTime) + @") div(" + section + @")) - group by tmp_x.x + group by tmp_x.x + order by tmp_x.x; "; } Console.WriteLine(sqlStr); @@ -142,7 +143,8 @@ namespace CoreCms.Net.Services where 1 = 1 " + where + @" ) o on tmp_x.x = ((unix_timestamp(o." + joinVal + @") - " + CommonHelper.ConvertDateTimeToInt(sTime) + @") div(" + section + @")) - group by tmp_x.x + group by tmp_x.x + order by tmp_x.x; "; } @@ -202,7 +204,8 @@ namespace CoreCms.Net.Services where 1 = 1 " + where + @" ) o on tmp_x.x = ((unix_timestamp(o." + joinVal + @") - " + CommonHelper.ConvertDateTimeToInt(sTime) + @") div(" + section + @")) - group by tmp_x.x + group by tmp_x.x + order by tmp_x.x; "; } @@ -259,7 +262,8 @@ namespace CoreCms.Net.Services where 1 = 1 " + where + @" ) o on tmp_x.x = ((unix_timestamp(o." + joinVal + @") - " + CommonHelper.ConvertDateTimeToInt(sTime) + @") div(" + section + @")) - group by tmp_x.x + group by tmp_x.x + order by tmp_x.x; "; } diff --git a/CoreCms.Net.Web.Admin/Controllers/Reports/CoreCmsReportsController.cs b/CoreCms.Net.Web.Admin/Controllers/Reports/CoreCmsReportsController.cs index f7e5421b..35b6978c 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Reports/CoreCmsReportsController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Reports/CoreCmsReportsController.cs @@ -236,7 +236,7 @@ namespace CoreCms.Net.Web.Admin.Controllers.Content whereSql += " and updateTime < '" + getDate.end.ToString("yyyy-MM-dd HH:mm:ss") + "' "; whereSql += " and status = 2 "; whereSql += " and type = " + (int)GlobalEnumVars.BillPaymentsType.Common + " "; - data = _reportsServices.GetRefundMark(getDate.num, whereSql, getDate.section, getDate.start, "updateTime"); + data = _reportsServices.GetRefundMark(getDate.num, whereSql, getDate.section, getDate.start, "createTime"); data3 = data; break; case "充值":