lsm/SqlSugar
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/SqlSugar.git synced 2025-11-08 18:34:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update core

Browse Source
This commit is contained in:
sunkaixuna
2021-04-26 20:04:39 +08:00
parent 8b65f535ad
commit 42dc4cbced
1 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Utilities/DataTableExtensions.cs
View File

@@ -5,6 +5,7 @@ using System.Dynamic;
using System.Linq; using System.Linq;
using System.Linq.Expressions; using System.Linq.Expressions;
using System.Text; using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace SqlSugar namespace SqlSugar
@@ -18,7 +19,11 @@ namespace SqlSugar
Func<IEnumerable<T>, TData> dataSelector) Func<IEnumerable<T>, TData> dataSelector)
{ {
DataTable table = new DataTable(); DataTable table = new DataTable();
var rowName = ((MemberExpression)rowSelector.Body).Member.Name; var rowName = "";
if (rowSelector.Body is MemberExpression)
rowName = ((MemberExpression)rowSelector.Body).Member.Name;
else
rowName =string.Join(UtilConstants.ReplaceKey, ((NewExpression)rowSelector.Body).Arguments.Select(it=>it as MemberExpression).Select(it=>it.Member.Name));
table.Columns.Add(new DataColumn(rowName)); table.Columns.Add(new DataColumn(rowName));
var columns = source.Select(columnSelector).Distinct(); var columns = source.Select(columnSelector).Distinct();
@@ -44,7 +49,28 @@ namespace SqlSugar
dataRow.ItemArray = items.ToArray(); dataRow.ItemArray = items.ToArray();
table.Rows.Add(dataRow); table.Rows.Add(dataRow);
} }
var firstName = table.Columns[0]?.ColumnName;
if (firstName.ObjToString().Contains(UtilConstants.ReplaceKey))
{
int i = 0;
foreach (var item in Regex.Split(firstName,UtilConstants.ReplaceKey))
{
i++;
table.Columns.Add(item);
table.Columns[item].SetOrdinal(i);
}
foreach (DataRow row in table.Rows)
{
var json =row[firstName];
var list = json.ToString().TrimStart('{').TrimEnd('}').Split(',').Select(it=>it.Split('=')).ToList();
foreach (var item in Regex.Split(firstName, UtilConstants.ReplaceKey))
{
var x = list.First(it => it.First().Trim() == item.Trim());
row[item] =x[1] ;
}
}
table.Columns.Remove(firstName);
}
return table; return table;
} }
public static List<dynamic> ToPivotList<T, TColumn, TRow, TData>( public static List<dynamic> ToPivotList<T, TColumn, TRow, TData>(