Merge branch 'YanShi' of http://8.130.121.29:3000/yuyubo/YunTongJackYunTask into YanShi

Reportapi/MyCode.Project.WebApi/Areas/Admin/Controllers/DataChartController.cs

@@ -0,0 +1,61 @@
+using MyCode.Project.Domain.Message.Act.Common;
+using MyCode.Project.Domain.Message.Response.LxmZHMDReport;
+using MyCode.Project.Infrastructure.Cache;
+using MyCode.Project.Infrastructure.Common;
+using MyCode.Project.Infrastructure.Constant;
+using MyCode.Project.Infrastructure.Enumeration;
+using MyCode.Project.Infrastructure.Exceptions;
+using MyCode.Project.Services;
+using MyCode.Project.WebApi.App_Filter;
+using System;
+using System.IO;
+using System.Web.Http;
+
+namespace MyCode.Project.WebApi.Areas.Admin.Controllers
+{
+    /// <summary>
+    /// 报表
+    /// </summary>
+    public class DataChartController : BaseAdminController
+    {
+        #region 初始化
+        private IYuyuboService _yuyuboService;
+
+        public DataChartController(IYuyuboService yuyuboService)
+        {
+            _yuyuboService = yuyuboService;
+
+
+        }
+        #endregion
+
+        #region Test(测试方法)
+        /// <summary>
+        /// 测试方法
+        /// </summary>
+        [AllowAnonymous]
+        [HttpGet]
+        public string Test()
+        {
+
+            return "test";
+
+        }
+        #endregion
+
+
+        /// <summary>
+        /// 销售订单列表
+        /// </summary>
+        /// <param name="search"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [AllowAnonymous]
+        public PageResult<SalOrderResp> GetPageList(PagedSearch search)
+        {
+            return _yuyuboService.GetPageList(search);
+        }
+
+
+    }
+}

Reportapi/MyCode.Project.WebApi/Areas/Admin/Controllers/LxmZHMDReportController.cs

@@ -13,7 +13,7 @@ using System.Web.Http;
 namespace MyCode.Project.WebApi.Areas.Admin.Controllers
 {
     /// <summary>
-    /// 流行美智慧门店报表
+    /// 导出功能
     /// </summary>
     public class LxmZHMDReportController : BaseAdminController
     {

Reportapi/MyCode.Project.WebApi/MyCode.Project.WebApi.csproj

@@ -203,6 +203,7 @@
     <Compile Include="App_Start\UnityWebApiActivator.cs" />
     <Compile Include="App_Start\WebApiConfig.cs" />
     <Compile Include="Areas\Admin\Controllers\BaseAdminController.cs" />
+    <Compile Include="Areas\Admin\Controllers\DataChartController.cs" />
     <Compile Include="Areas\Admin\Controllers\LxmZHMDReportController.cs" />
     <Compile Include="Areas\Extensions.cs" />
     <Compile Include="Areas\Wechat\Controllers\BaseWechatController.cs" />