lsm/SqlSugar
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/SqlSugar.git synced 2026-01-22 21:01:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

解决 ToPivotTable和ToPivotList 的 it=>ite.Name问题

Browse Source
This commit is contained in:
YHS
2024-01-08 11:59:54 +08:00
parent d94eb3a6d2
commit ee3dc54e7b
2 changed files with 170 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
Src/Asp.Net/SqlSugar/Utilities/DataTableExtensions.cs
View File

@@ -19,15 +19,15 @@ namespace SqlSugar
Func<IEnumerable<T>, TData> dataSelector) Func<IEnumerable<T>, TData> dataSelector)
{ {
if (rowSelector.Body is MemberExpression)
return PivotHelper.ToPivotTable(source, columnSelector, rowSelector, dataSelector);
DataTable table = new DataTable(); DataTable table = new DataTable();
var rowName = new List<string>(); var rowName = new List<string>();
var memberName = string.Empty;
if (rowSelector.Body is MemberExpression) if (rowSelector.Body is MemberExpression)
rowName.Add(((MemberExpression)rowSelector.Body).Member.Name); {
memberName = ((MemberExpression)rowSelector.Body).Member.Name;
rowName.Add(memberName);
}
else else
rowName.AddRange(((NewExpression)rowSelector.Body).Arguments.Select(it => it as MemberExpression).Select(it => it.Member.Name)); rowName.AddRange(((NewExpression)rowSelector.Body).Arguments.Select(it => it as MemberExpression).Select(it => it.Member.Name));
@@ -36,6 +36,8 @@ namespace SqlSugar
var columns = source.Select(columnSelector).Distinct(); var columns = source.Select(columnSelector).Distinct();
table.Columns.AddRange(columns.Select(x => new DataColumn(x?.ToString())).ToArray()); table.Columns.AddRange(columns.Select(x => new DataColumn(x?.ToString())).ToArray());
if (string.IsNullOrEmpty(memberName))
{
var rows = source.GroupBy(rowSelector.Compile()) var rows = source.GroupBy(rowSelector.Compile())
.Select(rowGroup => .Select(rowGroup =>
{ {
@@ -57,8 +59,33 @@ namespace SqlSugar
.ToArray(); .ToArray();
table.Rows.Add(row); table.Rows.Add(row);
return row; return row;
})
.ToList();
} }
).ToList(); else
{
var rows = source.GroupBy(rowSelector.Compile())
.Select(rowGroup =>
{
var row = table.NewRow();
row[memberName] = rowGroup.Key;
columns.GroupJoin(rowGroup, c => c, r => columnSelector(r),
(c, columnGroup) =>
{
var dic = new Dictionary<string, object>();
if (c != null)
dic[c.ToString()] = dataSelector(columnGroup);
return dic;
})
.SelectMany(x => x)
.Select(x => row[x.Key] = x.Value)
.ToArray();
table.Rows.Add(row);
return row;
}).ToList();
}
return table; return table;
} }
@@ -69,18 +96,15 @@ namespace SqlSugar
Func<IEnumerable<T>, TData> dataSelector) Func<IEnumerable<T>, TData> dataSelector)
{ {
if (rowSelector.Body is MemberExpression)
return PivotHelper.ToPivotList(source, columnSelector, rowSelector, dataSelector);
var rowName = new List<string>(); var rowName = new List<string>();
var memberName = string.Empty;
if (rowSelector.Body is MemberExpression) if (rowSelector.Body is MemberExpression)
rowName.Add(((MemberExpression)rowSelector.Body).Member.Name); memberName = ((MemberExpression)rowSelector.Body).Member.Name;
else
rowName.AddRange(((NewExpression)rowSelector.Body).Arguments.Select(it => it as MemberExpression).Select(it => it.Member.Name));
var columns = source.Select(columnSelector).Distinct(); var columns = source.Select(columnSelector).Distinct();
if (string.IsNullOrEmpty(memberName))
{
var rows = source.GroupBy(rowSelector.Compile()) var rows = source.GroupBy(rowSelector.Compile())
.Select(rowGroup => .Select(rowGroup =>
{ {
@@ -99,9 +123,32 @@ namespace SqlSugar
.Select(x => row[x.Key] = x.Value) .Select(x => row[x.Key] = x.Value)
.SelectMany(x => properties, (x, y) => row[y.Name] = y.GetValue(rowGroup.Key, null)) .SelectMany(x => properties, (x, y) => row[y.Name] = y.GetValue(rowGroup.Key, null))
.ToList(); .ToList();
return row.OrderBy(it=> rowName.Contains(it.Key)?0:1); return row;
});
return rows;
}
else
{
var rows = source.GroupBy(rowSelector.Compile())
.Select(rowGroup =>
{
IDictionary<string, object> row = new ExpandoObject();
row[memberName] = rowGroup.Key;
columns.GroupJoin(rowGroup, c => c, r => columnSelector(r),
(c, columnGroup) =>
{
IDictionary<string, object> dic = new ExpandoObject();
if (c != null)
dic[c.ToString()] = dataSelector(columnGroup);
return dic;
})
.SelectMany(x => x)
.Select(x => row[x.Key] = x.Value)
.ToList();
return row;
}); });
return rows; return rows;
} }
} }
} }
}

77
Src/Asp.NetCore2/SqlSugar/Utilities/DataTableExtensions.cs
View File

@@ -7,6 +7,7 @@ using System.Linq.Expressions;
using System.Text; using System.Text;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Xml.Linq;
namespace SqlSugar namespace SqlSugar
{ {
@@ -19,15 +20,15 @@ namespace SqlSugar
Func<IEnumerable<T>, TData> dataSelector) Func<IEnumerable<T>, TData> dataSelector)
{ {
if (rowSelector.Body is MemberExpression)
return PivotHelper.ToPivotTable(source, columnSelector, rowSelector, dataSelector);
DataTable table = new DataTable(); DataTable table = new DataTable();
var rowName = new List<string>(); var rowName = new List<string>();
var memberName = string.Empty;
if (rowSelector.Body is MemberExpression) if (rowSelector.Body is MemberExpression)
rowName.Add(((MemberExpression)rowSelector.Body).Member.Name); {
memberName = ((MemberExpression)rowSelector.Body).Member.Name;
rowName.Add(memberName);
}
else else
rowName.AddRange(((NewExpression)rowSelector.Body).Arguments.Select(it => it as MemberExpression).Select(it => it.Member.Name)); rowName.AddRange(((NewExpression)rowSelector.Body).Arguments.Select(it => it as MemberExpression).Select(it => it.Member.Name));
@@ -36,6 +37,8 @@ namespace SqlSugar
var columns = source.Select(columnSelector).Distinct(); var columns = source.Select(columnSelector).Distinct();
table.Columns.AddRange(columns.Select(x => new DataColumn(x?.ToString())).ToArray()); table.Columns.AddRange(columns.Select(x => new DataColumn(x?.ToString())).ToArray());
if (string.IsNullOrEmpty(memberName))
{
var rows = source.GroupBy(rowSelector.Compile()) var rows = source.GroupBy(rowSelector.Compile())
.Select(rowGroup => .Select(rowGroup =>
{ {
@@ -57,8 +60,33 @@ namespace SqlSugar
.ToArray(); .ToArray();
table.Rows.Add(row); table.Rows.Add(row);
return row; return row;
})
.ToList();
} }
).ToList(); else
{
var rows = source.GroupBy(rowSelector.Compile())
.Select(rowGroup =>
{
var row = table.NewRow();
row[memberName] = rowGroup.Key;
columns.GroupJoin(rowGroup, c => c, r => columnSelector(r),
(c, columnGroup) =>
{
var dic = new Dictionary<string, object>();
if (c != null)
dic[c.ToString()] = dataSelector(columnGroup);
return dic;
})
.SelectMany(x => x)
.Select(x => row[x.Key] = x.Value)
.ToArray();
table.Rows.Add(row);
return row;
}).ToList();
}
return table; return table;
} }
@@ -69,18 +97,15 @@ namespace SqlSugar
Func<IEnumerable<T>, TData> dataSelector) Func<IEnumerable<T>, TData> dataSelector)
{ {
if (rowSelector.Body is MemberExpression)
return PivotHelper.ToPivotList(source, columnSelector, rowSelector, dataSelector);
var rowName = new List<string>(); var rowName = new List<string>();
var memberName = string.Empty;
if (rowSelector.Body is MemberExpression) if (rowSelector.Body is MemberExpression)
rowName.Add(((MemberExpression)rowSelector.Body).Member.Name); memberName = ((MemberExpression)rowSelector.Body).Member.Name;
else
rowName.AddRange(((NewExpression)rowSelector.Body).Arguments.Select(it => it as MemberExpression).Select(it => it.Member.Name));
var columns = source.Select(columnSelector).Distinct(); var columns = source.Select(columnSelector).Distinct();
if (string.IsNullOrEmpty(memberName))
{
var rows = source.GroupBy(rowSelector.Compile()) var rows = source.GroupBy(rowSelector.Compile())
.Select(rowGroup => .Select(rowGroup =>
{ {
@@ -99,9 +124,31 @@ namespace SqlSugar
.Select(x => row[x.Key] = x.Value) .Select(x => row[x.Key] = x.Value)
.SelectMany(x => properties, (x, y) => row[y.Name] = y.GetValue(rowGroup.Key, null)) .SelectMany(x => properties, (x, y) => row[y.Name] = y.GetValue(rowGroup.Key, null))
.ToList(); .ToList();
return row.OrderBy(it=> rowName.Contains(it.Key)?0:1); return row;
});
return rows;
}
else {
var rows = source.GroupBy(rowSelector.Compile())
.Select(rowGroup =>
{
IDictionary<string, object> row = new ExpandoObject();
row[memberName] = rowGroup.Key;
columns.GroupJoin(rowGroup, c => c, r => columnSelector(r),
(c, columnGroup) =>
{
IDictionary<string, object> dic = new ExpandoObject();
if (c != null)
dic[c.ToString()] = dataSelector(columnGroup);
return dic;
})
.SelectMany(x => x)
.Select(x => row[x.Key] = x.Value)
.ToList();
return row;
}); });
return rows; return rows;
} }
} }
} }
}