Merge branch 'master' of http://110.188.24.182:10023/Fengwo/hotline

src/Hotline.Api/Controllers/Bigscreen/DataScreenController.cs

@@ -375,13 +375,13 @@ namespace Hotline.Api.Controllers.Bigscreen
         /// <returns></returns>
         [AllowAnonymous]
         [HttpGet("highmatter-warning")]
-        public async Task<List<HighMatterWarningDto>> HighMatterWarning()
+        public async Task<List<HighMatterWarningDto>> HighMatterWarning(DateTime StartDate,DateTime EndDate)
         {
-            var endDate = DateTime.Now.Date.AddDays(1).AddSeconds(-1);
-            var startDate = endDate.AddDays(-30).Date;
+            //var endDate = DateTime.Now.Date.AddDays(1).AddSeconds(-1);
+            //var startDate = endDate.AddDays(-30).Date;
 
             var list = await _orderRepository.Queryable(false, false, false)
-                .Where(x => x.CreationTime >= startDate && x.CreationTime <= endDate)
+                .Where(x => x.CreationTime >= StartDate && x.CreationTime <= EndDate)
                 .LeftJoin<SystemArea>((it, o) => it.AreaCode.Substring(SqlFunc.MappingColumn<int>("0"), SqlFunc.MappingColumn<int>("6")) == o.Id)
                 .GroupBy((it, o) => new
                 {