!148 【修复】调整查询动态表达式组合Expression.And为Expression.AndAlso。【升级】升级多个组件到最新版本。【优化】去除发货单统计7天统计、支付单7天统计、按天统计新会员三个图表Sql执行语句,替换为使用SqlSugar检索语句。

* 【升级】升级多个组件到最新版本。
* ## 1.0.7(2021-10-14)
This commit is contained in:
大灰灰
2021-10-14 03:39:26 +00:00
parent 1754618eea
commit 7f4b7dde48
16 changed files with 64 additions and 95 deletions
@@ -150,30 +150,19 @@ namespace CoreCms.Net.Repository
/// <returns></returns>
public async Task<List<StatisticsOut>> Statistics(int day)
{
var dt = DateTime.Now.AddDays(-day).ToString("yyyy-MM-dd");
var dt = DateTime.Now.AddDays(-day);
var list = await DbClient.Queryable<CoreCmsUser>()
.Where(p => p.createTime >= dt)
.Select(it => new
{
it.id,
createTime = it.createTime.Date
})
.MergeTable()
.GroupBy(it => it.createTime)
.Select(it => new StatisticsOut { day = it.createTime.ToString("yyyy-MM-dd"), nums = SqlFunc.AggregateCount(it.id) })
.ToListAsync();
var sqlStr = string.Empty;
string dbTypeString = AppSettingsConstVars.DbDbType;
if (dbTypeString == DbType.SqlServer.ToString())
{
sqlStr = @"SELECT count(1) AS nums,CONVERT(varchar(100),createTime, 23) AS day
FROM CoreCmsUser
WHERE createTime > '" + dt + @"'
GROUP BY CONVERT(varchar(100),createTime, 23)";
}
else if (dbTypeString == DbType.MySql.ToString())
{
sqlStr = @"SELECT count(1) AS nums,date(createTime) AS day
FROM CoreCmsUser
WHERE createTime > '" + dt + @"'
GROUP BY date(createTime)";
}
if (string.IsNullOrEmpty(sqlStr))
{
return null;
}
var list = await DbClient.SqlQueryable<StatisticsOut>(sqlStr).ToListAsync();
return list;
}