新增月销售利润报表接口

Bailun.DC.Models/WebApiModels/Attribute/ParentNameAttribute.cs

+using System.ComponentModel;
+
+namespace Bailun.DC.Models.WebApiModels
+{
+    /// <summary>
+    /// 上级名称特性
+    /// </summary>
+    public class ParentNameAttribute : DisplayNameAttribute
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public override string DisplayName { get; }
+
+        /// <summary>
+        /// 上级名称
+        /// </summary>
+        public ParentNameEnum? ParentName { get; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="displayName"></param>
+        public ParentNameAttribute(string displayName)
+        {
+            DisplayName = displayName;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="displayName"></param>
+        /// <param name="parentName"></param>
+        public ParentNameAttribute(string displayName, ParentNameEnum parentName)
+        {
+            DisplayName = displayName;
+            ParentName = parentName;
+        }
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public enum ParentNameEnum
+    {
+        None = 0,
+
+        /// <summary>
+        /// 销售额
+        /// </summary>
+        [Description("销售额")]
+        amount_sales = 1,
+
+        /// <summary>
+        /// 成本
+        /// </summary>
+        [Description("成本")]
+        cost = 2,
+
+        /// <summary>
+        /// 平台费
+        /// </summary>
+        [Description("平台费")]
+        fee_platform = 3,
+
+        /// <summary>
+        /// 仓储费
+        /// </summary>
+        [Description("仓储费")]
+        fee_logistics_storage = 4,
+
+        /// <summary>
+        /// 销售费用合计
+        /// </summary>
+        [Description("销售费用合计")]
+        fee_sales_count = 5,
+
+        /// <summary>
+        /// 管理成本合计
+        /// </summary>
+        [Description("管理成本合计")]
+        managercost_count = 6,
+
+        /// <summary>
+        /// 营业利润
+        /// </summary>
+        [Description("营业利润")]
+        profit = 7,
+
+        /// <summary>
+        /// 实际利润
+        /// </summary>
+        [Description("实际利润")]
+        actual_profit = 8,
+
+        /// <summary>
+        /// 净利率
+        /// </summary>
+        [Description("净利率")]
+        rate_profit_actual = 9
+    }
+}

Bailun.DC.Services/WebApiService/FinanceService.cs

@@ -10,6 +10,7 @@ using MySql.Data.MySqlClient;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
+using System.Data;
 using System.Linq;
 using System.Net.Http;
 using System.Text;
@@ -436,5 +437,23 @@ and s1.management_cost_name = @managementcostname";
             jsonStr += "]";
             return (colList, jsonStr);
         }
+
+        /// <summary>
+        /// 月度利润报表
+        /// </summary>
+        /// <param name="start">开始月份</param>
+        /// <param name="end">结束月份</param>
+        /// <returns></returns>
+        public List<MonthSalesProfitDto> ListMonthSaleProfitNew(string start, string end)
+        {
+            var sql = $"select * from dc_month_sales_profit where month>='{start}' ";
+
+            if (!string.IsNullOrEmpty(end))
+            {
+                sql += (" and month<='" + end + "'");
+            }
+            var data = SimpleCRUD.Query<MonthSalesProfitDto>(sql, null, GlobalConfig.ConnectionString).ToList();
+            return data;
+        }
     }
 }

Bailun.DC.WebApi/Controllers/BaseController.cs

@@ -15,7 +15,8 @@ namespace Bailun.DC.WebApi.Controllers
         /// <param name="list"></param>
         /// <param name="columns"></param>
         /// <param name="tbName"></param>
-        public void ToCSV(List<string> list, List<string> columns, string tbName, string filePath)
+        [NonAction]
+        protected void ToCSV(List<string> list, List<string> columns, string tbName, string filePath)
         {
             var strb = string.Empty;
 

Bailun.DC.WebApi/Models/Finance/MonthSalesProfitResponse.cs

+using Bailun.DC.Models.WebApiModels;
+using System.Collections.Generic;
+
+namespace Bailun.DC.WebApi.Models
+{
+    /// <summary>
+    /// 月销售利润
+    /// </summary>
+    public class MonthSalesProfitResponse
+    {
+        public MonthSalesProfitResponse()
+        {
+            Col = new List<MonthSalesProfitColumnsModel>();
+        }
+
+        /// <summary>
+        /// json字符串
+        /// </summary>
+        public string DataJson { get; set; }
+
+        /// <summary>
+        /// 表头
+        /// </summary>
+        public List<MonthSalesProfitColumnsModel> Col { get; set; }
+    }
+
+    /// <summary>
+    /// 表头
+    /// </summary>
+    public class MonthSalesProfitColumnsModel
+    {
+        /// <summary>
+        /// 显示名称
+        /// </summary>
+        public string Title { get; set; }
+
+        /// <summary>
+        /// Key
+        /// </summary>
+        public string Key { get; set; }
+
+        /// <summary>
+        /// 宽度
+        /// </summary>
+        public int Width { get; set; } = 200;
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public List<MonthSalesProfitColumnsChildren> Children { get; set; }
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public class MonthSalesProfitColumnsChildren
+    {
+        /// <summary>
+        /// 显示名称
+        /// </summary>
+        public string Title { get; set; }
+
+        /// <summary>
+        /// Key
+        /// </summary>
+        public string Key { get; set; }
+
+        /// <summary>
+        /// 宽度
+        /// </summary>
+        public int Width { get; set; } = 150;
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public class KeyDisplayNameModel
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public string DisplayName { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string KeyName { get; set; }
+
+        /// <summary>
+        /// 上级名称
+        /// </summary>
+        public ParentNameEnum? ParentName { get; set; }
+    }
+}