同上

Bailun.DC.Web/Areas/Reports/Controllers/FinanceController.cs

@@ -263,21 +263,47 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
 
             if (type == 2) //按周
             {
-                if (date.DayOfWeek == DayOfWeek.Saturday)
+                if (day.HasValue)  //Add by Allan at 20210429，按周也可以选择日期进行查看
+                {
+                    date = day.Value;
+                }
+                else
                 {
                     date = date.AddDays(-1);
                 }
+
+                if (date.DayOfWeek == DayOfWeek.Saturday)
+                {
+                    date = date.AddDays(-4);
+                }
                 else if (date.DayOfWeek == DayOfWeek.Sunday)
                 {
+                    date = date.AddDays(-5);
+                }
+                else if (date.DayOfWeek == DayOfWeek.Friday)
+                {
+                    date = date.AddDays(-3);
+                }
+                else if (date.DayOfWeek == DayOfWeek.Thursday)
+                {
                     date = date.AddDays(-2);
                 }
-                else
+                else if (date.DayOfWeek == DayOfWeek.Wednesday)
                 {
-                    date = date.AddDays(-2 - (int)date.DayOfWeek);
+                    date = date.AddDays(-1);
+                }
+                else if (date.DayOfWeek == DayOfWeek.Monday)
+                {
+                    date = date.AddDays(-6);
                 }
             }
             else if (type == 3) //按月
             {
+                if (day.HasValue)  //Add by Allan at 20210429，for 月份也可选择日期进行查看
+                {
+                    date = day.Value;
+                }
+
                 if (date.AddDays(1).ToString("yyyy-MM") == date.ToString("yyyy-MM"))
                 {
                     date = DateTime.Parse(date.ToString("yyyy-MM") + "-01").AddDays(-1);