逻辑仓库趋势图增加日期筛选功能

Bailun.DC.Services/WareHouseServices.cs

@@ -1111,9 +1111,13 @@ namespace Bailun.DC.Services
         /// <param name="warehouse_code"></param>
         /// <param name="columnname"></param>
         /// <returns></returns>
-        public string GetMidLogicWarehouseStatistic(string warehouse_code, string columnname)
+        public List<string> GetMidLogicWarehouseStatistic(string warehouse_code, string columnname,DateTime start,DateTime end)
         {
-            var sql = "select "+columnname+ " from dc_mid_logic_wh_statistic where warehouse_code='"+warehouse_code+"'";
+            var sql = "select CONCAT("+columnname+",',',DATE_FORMAT(day,'%Y-%m-%d')) from dc_daily_logic_wh_statistic where warehouse_code='" + warehouse_code+"' ";
+
+            sql += $" and day>='{start.ToString("yyyy-MM-dd")}' and day<='{end.ToString("yyyy-MM-dd")}'";
+
+            sql += " order by day";
 
             using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
             {
@@ -1122,7 +1126,7 @@ namespace Bailun.DC.Services
                     cn.Open();
                 }
 
-                return cn.QueryFirstOrDefault<string>(sql);
+                return cn.Query<string>(sql).ToList();
             }
         }
 

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

@@ -1583,6 +1583,10 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
             ViewBag.warehouse_code = warehouse_code;
             ViewBag.key = key;
             ViewBag.titlename = titlename;
+
+            ViewBag.start = DateTime.Now.AddDays(-31).ToString("yyyy-MM-dd");
+            ViewBag.end = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd");
+
             return View();
         }
 
@@ -1593,19 +1597,23 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
         /// <param name="key"></param>
         /// <returns></returns>
         [HttpPost]
-        public JsonResult WarehouseTrendChartJson(string warehouse_code,string key)
+        public JsonResult WarehouseTrendChartJson(string warehouse_code,string key,DateTime start,DateTime end)
         {
-            var obj = new Services.WareHouseServices().GetMidLogicWarehouseStatistic(warehouse_code, key);
+            var obj = new Services.WareHouseServices().GetMidLogicWarehouseStatistic(warehouse_code, key,start,end);
 
             var listval = new List<string>();
             var listdate = new List<string>();
 
-            if (!string.IsNullOrEmpty(obj))
+            if (obj.Count>0)
             {
-                listval = obj.Split(',').ToList();
-                for(var i=1;i< listval.Count+1;i++)
+                foreach (var item in obj)
                 {
-                    listdate.Insert(0,DateTime.Now.AddDays(-i).ToString("yyyy-MM-dd"));
+                    var arr = item.Split(',');
+                    if (arr.Length > 1)
+                    {
+                        listval.Add(arr[0]);
+                        listdate.Add(DateTime.Parse(arr[1]).ToString("yyyy-MM-dd"));
+                    }
                 }
             }
 

Bailun.DC.Web/Areas/Reports/Views/Warehouse/LogicWarehouse.cshtml

@@ -251,7 +251,7 @@
         }
 
         function ShowTrendChart(code, name, key,whname) {
-            layer_show(whname+"=》"+name + '的趋势图(30d)', '@Url.Content("~/Reports/Warehouse/WarehouseTrendChart?warehouse_code=")' + code + '&key=' + key + '&titlename=' + name,'90%','90%');
+            layer_show(whname+"=》"+name + '的趋势图', '@Url.Content("~/Reports/Warehouse/WarehouseTrendChart?warehouse_code=")' + code + '&key=' + key + '&titlename=' + name,'90%','90%');
         }
 
     </script>

Bailun.DC.Web/Areas/Reports/Views/Warehouse/WarehouseTrendChart.cshtml

@@ -7,9 +7,21 @@
 
 <div class="row">
     <div class="col-sm-12">
-        @*<div class="ibox-content m-b-sm border-bottom">
-
-            </div>*@
+        <div class="ibox-content m-b-sm border-bottom">
+            <form id="toolbar">
+                <div class="form-inline" style="line-height:40px;">
+                    <div class="form-group">
+                        <label>日期：</label>
+                        <input id="start" name="start" class="form-control" value="@(ViewBag.start)" placeholder="请选择开始日期" />至
+                        <input id="end" name="end" class="form-control" value="@(ViewBag.end)" placeholder="请选择结束日期" />
+                    </div>
+                    <div class="form-group">
+                        <label>&nbsp;</label>
+                        <button type="button" class="btn btn-primary" onclick="list();"><i class="fa fa-search"></i>&nbsp;查询</button>
+                    </div>
+                </div>
+            </form>
+        </div>
         <div class="ibox-content m-b-sm border-bottom">
             <div id="echart-contain" style="width:100%;height:480px;">
 
@@ -28,10 +40,16 @@
         })
 
         function list() {
+            if ($('#start').val() == '' || $('#end').val() == '') {
+                alert('请选择日期');
+                return;
+            }
+
+
             $.submit({
                 type:'POST',
                 url: '@Url.Content("~/Reports/Warehouse/WarehouseTrendChartJson")',
-                paramData: 'warehouse_code=@(ViewBag.warehouse_code)&key=@(ViewBag.key)',
+                paramData: 'warehouse_code=@(ViewBag.warehouse_code)&key=@(ViewBag.key)&' + $("#toolbar").serialize(),
                 func: function (result) {
                     if (result.success) {
                         var arrval = new Array();

Bailun.DC.Web/Controllers/HomeController.cs

@@ -77,7 +77,7 @@ namespace Bailun.DC.Web.Controllers
         public ActionResult Main()
         {
 #if DEBUG
-            var cookie = "Bearer eyJhbGciOiJSUzI1NiIsImtpZCI6IjdhZDA5MjQ5ZDk0ZDgxN2VhNmI5ZThhMTc1MzlmNmY3IiwidHlwIjoiSldUIn0.eyJuYmYiOjE1OTk4NzM3NTAsImV4cCI6MTU5OTkwOTc1MCwiaXNzIjoiaHR0cDovL2xvY2FsaG9zdDo1MDAxIiwiYXVkIjpbImh0dHA6Ly9sb2NhbGhvc3Q6NTAwMS9yZXNvdXJjZXMiLCJiYWlsdW5BcGkiXSwiY2xpZW50X2lkIjoiYmFpbHVuQ2xpZW50Iiwic3ViIjoi5YWz5oyv5bGxIiwiYXV0aF90aW1lIjoxNTk5ODczNzUwLCJpZHAiOiJsb2NhbCIsIlVzZXJJZCI6IjIzNDYiLCJzdWNlc3NzIjoidHJ1ZSIsIkNvbXBhbnkiOiJ7XCJJZFwiOjEsXCJDb21wYW55Q29kZVwiOlwiYmFpbHVuXCIsXCJDb21wYW55TmFtZVwiOlwi5bm_5bee55m-5Lym5L6b5bqU6ZO-5pyJ6ZmQ5YWs5Y-4XCJ9IiwiQWxsQ29tcGFueSI6IkZhbHNlIiwiVXNlckNvZGVOZXciOiJCTDExNjkiLCJVc2VyQ29kZSI6IkJMMTE3MCIsIk9hVXNlcklkIjoiMjM0NiIsIkRlcGFydG1lbnQiOiJ7XCJEZXBhcnRtZW50SWRcIjoyNTgsXCJOYW1lXCI6XCLmlbDmja7kuK3lv4NcIixcIkNvZGVcIjpcIlwifSIsInNjb3BlIjpbIm9wZW5pZCIsInByb2ZpbGUiLCJiYWlsdW5BcGkiXSwiYW1yIjpbImN1c3RvbSJdfQ.g9ZVFB44RBZNTMEk9609S1KmaS16pe0pBiELvVquzShBwCqMCaS_vB_IM2D9-VfTpDb7E9bYPVd8yr2RHWXuYETDM0AI3ZpAWkrpfDWxrmXM8SkdEW_qqxHdbmwYDZ5nDK0S03RnV_UaXmjrtTKCjxfptWgMVuLi5Obn0KgVaZvp7uP8GexhK8p2sn22WhunnU5PriDsSY8VsXwHl4jc5lblhujLatnabFJaiWdJrNCYz9viapjnpTpKmzxQTpz9-SWy9FSDwLUnsTXVWwZiGgkmQqqXiIHsqUo8U9HKBEI_6arcbRGnpUo2zwCmc5q9i1_hukeRlwfKQaC3oTHjrw";
+            var cookie = "Bearer eyJhbGciOiJSUzI1NiIsImtpZCI6IjdhZDA5MjQ5ZDk0ZDgxN2VhNmI5ZThhMTc1MzlmNmY3IiwidHlwIjoiSldUIn0.eyJuYmYiOjE2MDAwNTAwNDcsImV4cCI6MTYwMDA4NjA0NywiaXNzIjoiaHR0cDovL2xvY2FsaG9zdDo1MDAxIiwiYXVkIjpbImh0dHA6Ly9sb2NhbGhvc3Q6NTAwMS9yZXNvdXJjZXMiLCJiYWlsdW5BcGkiXSwiY2xpZW50X2lkIjoiYmFpbHVuQ2xpZW50Iiwic3ViIjoi5YWz5oyv5bGxIiwiYXV0aF90aW1lIjoxNjAwMDUwMDQ3LCJpZHAiOiJsb2NhbCIsIlVzZXJJZCI6IjIzNDYiLCJzdWNlc3NzIjoidHJ1ZSIsIkNvbXBhbnkiOiJ7XCJJZFwiOjEsXCJDb21wYW55Q29kZVwiOlwiYmFpbHVuXCIsXCJDb21wYW55TmFtZVwiOlwi5bm_5bee55m-5Lym5L6b5bqU6ZO-5pyJ6ZmQ5YWs5Y-4XCJ9IiwiQWxsQ29tcGFueSI6IkZhbHNlIiwiVXNlckNvZGVOZXciOiJCTDExNjkiLCJVc2VyQ29kZSI6IkJMMTE3MCIsIk9hVXNlcklkIjoiMjM0NiIsIkRlcGFydG1lbnQiOiJ7XCJEZXBhcnRtZW50SWRcIjoyNTgsXCJOYW1lXCI6XCLmlbDmja7kuK3lv4NcIixcIkNvZGVcIjpcIlwifSIsInNjb3BlIjpbIm9wZW5pZCIsInByb2ZpbGUiLCJiYWlsdW5BcGkiXSwiYW1yIjpbImN1c3RvbSJdfQ.M2S1aNkyns2yQPt-itQZhNYhhJI4vSfMtfmV9kH-0ufOW9xGnNvf0j949p_zi3JkCejVAKoR1yO7luHkiolfvwtwAlX0yzWeiX41myHo3f8eAH42lnmfUB7CuKkDFVn9wc0sgRbHPIYO3E1Xhd3colgblF6T-9XC9Xvau46-pZw8uvoeIo-FC79aBX8LoDgsamxN2tDKTuE0fjuFosXtPHQgm2oZUdsTpyHyLYAlGO6a6DUB3ZpjoUVu6SGi3NRxuX7jEzCoMkr4XM5soRDRgjIZq9TgGEehr4en3MRHRdQ03KaxR_sgpGip0dNvm0kWARlvh049Yn6tjCJ2jzVQTw";
 #else
             //var user = Common.HttpHelper.NetHelper.Request("http://sso.bailuntec.com/GetUserResource");
             var cookie = HttpContext.Request.Cookies["BailunToken"];