From 5c5ae1d9f72a857aaad0499348f2373e4c22f25b Mon Sep 17 00:00:00 2001
From: wugang <425674808@qq.com>
Date: Thu, 12 Apr 2018 14:39:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=88=86=E7=BB=84=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Reports/ToFreightNetPriceReport2.cs        | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport2.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport2.cs
index dc3a0d0..b113e8a 100644
--- a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport2.cs
+++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport2.cs
@@ -434,32 +434,34 @@ B3SaleDataSources.经销商), s => long.Parse(s)), "CustomerDealer_ID"));
         switch (field) {
           case "YearOfLoadTime":
             dom.Columns.Add(DQSelectColumn.Create(DQExpression.Snippet<string>("Left(Convert(nvarchar(10),main.LoadTime, 23),4)"), item.Text));
-            dom.GroupBy.Expressions.Add(DQExpression.Field(main, "LoadTime"));
+            dom.GroupBy.Expressions.Add(DQExpression.Snippet<string>("Left(Convert(nvarchar(10),main.LoadTime, 23),4)"));
             ColumnNames.Add(item.Text);
             break;
           case "MonthOfLoadTime":
             dom.Columns.Add(DQSelectColumn.Create(DQExpression.Snippet<string>("Left(Convert(nvarchar(10),main.LoadTime, 23),7)"), item.Text));
-            dom.GroupBy.Expressions.Add(DQExpression.Field(main, "LoadTime"));
+            dom.GroupBy.Expressions.Add(DQExpression.Snippet<string>("Left(Convert(nvarchar(10),main.LoadTime, 23),7)"));
             ColumnNames.Add(item.Text);
             break;
           case "TenDaysOfLoadTime":
-            dom.Columns.Add(DQSelectColumn.Create(DQExpression.Snippet<string>(@"CASE WHEN day(main.LoadTime) > 0 AND day(main.LoadTime)<= 10 
+            var expression = DQExpression.Snippet<string>(@"CASE WHEN day(main.LoadTime) > 0 AND day(main.LoadTime)<= 10 
 							THEN cast(YEAR(main.LoadTime)as nvarchar)+'年'+cast(MONTH(main.LoadTime)as nvarchar) + '月上旬' 
 							WHEN day(main.LoadTime) > 10 AND day(main.LoadTime)<= 20 
 							THEN cast(YEAR(main.LoadTime)as nvarchar)+'年'+cast(MONTH(main.LoadTime)as nvarchar) + '月中旬' 
 							WHEN day(main.LoadTime) > 20 
-							THEN cast(YEAR(main.LoadTime)as nvarchar)+'年'+cast(MONTH(main.LoadTime)as nvarchar) + '月下旬' END"), item.Text));
-            dom.GroupBy.Expressions.Add(DQExpression.Field(main, "LoadTime"));
+							THEN cast(YEAR(main.LoadTime)as nvarchar)+'年'+cast(MONTH(main.LoadTime)as nvarchar) + '月下旬' END");
+            dom.Columns.Add(DQSelectColumn.Create(expression, item.Text));
+            dom.GroupBy.Expressions.Add(expression);
             ColumnNames.Add(item.Text);
             break;
           case "WeekOfLoadTime":
-            dom.Columns.Add(DQSelectColumn.Create(DQExpression.Snippet<string>("convert(nvarchar(10), dateadd(day,1-(datepart(weekday,main.LoadTime)+@@datefirst-1)%7,main.LoadTime),23)+'～'+convert(nvarchar(10),dateadd(day,7-(datepart(weekday,main.LoadTime)+@@datefirst-1)%7,main.LoadTime),23)"), item.Text));
-            dom.GroupBy.Expressions.Add(DQExpression.Field(main, "LoadTime"));
+            var expression2 = DQExpression.Snippet<string>("convert(nvarchar(10), dateadd(day,1-(datepart(weekday,main.LoadTime)+@@datefirst-1)%7,main.LoadTime),23)+'～'+convert(nvarchar(10),dateadd(day,7-(datepart(weekday,main.LoadTime)+@@datefirst-1)%7,main.LoadTime),23)");
+            dom.Columns.Add(DQSelectColumn.Create(expression2, item.Text));
+            dom.GroupBy.Expressions.Add(expression2);
             ColumnNames.Add(item.Text);
             break;
           case "DayOfLoadTime":
             dom.Columns.Add(DQSelectColumn.Create(DQExpression.Snippet<string>("Convert(nvarchar(10),main.LoadTime, 23)"), item.Text));
-            dom.GroupBy.Expressions.Add(DQExpression.Field(main, "LoadTime"));
+            dom.GroupBy.Expressions.Add(DQExpression.Snippet<string>("Convert(nvarchar(10),main.LoadTime, 23)"));
             ColumnNames.Add(item.Text);
             break;
           case "Code":