调整资产负债表取数和页面样式调整，调整为和旧报表一致

Bailun.DC.Models/dc_balance_sheet_new_result.cs

 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Text;
 
 namespace Bailun.DC.Models
@@ -27,6 +28,7 @@ namespace Bailun.DC.Models
         /// <summary>
         /// 货币资金
         /// </summary>
+        [Description("货币资金")]
         public decimal? monetary_fund { get; set; }
 
 
@@ -51,6 +53,7 @@ namespace Bailun.DC.Models
         /// <summary>
         /// 应收账款
         /// </summary>
+        [Description("应收账款")]
         public decimal? accounts_receivable { get; set; }
 
 
@@ -63,6 +66,7 @@ namespace Bailun.DC.Models
         /// <summary>
         /// 预付款项
         /// </summary>
+        [Description("预付款项")]
         public decimal? prepayment { get; set; }
 
 
@@ -87,12 +91,14 @@ namespace Bailun.DC.Models
         /// <summary>
         /// 其他应收款
         /// </summary>
+        [Description("其他应收款")]
         public decimal? other_accounts_receivable { get; set; }
 
 
         /// <summary>
         /// 存货余额/库存金额
         /// </summary>
+        [Description("存货")]
         public decimal? inventory_amount { get; set; }
 
 
@@ -210,72 +216,7 @@ namespace Bailun.DC.Models
         public decimal? semi_prod_inventory_amount { get; set; }
 
 
-        /// <summary>
-        /// 固定资产
-        /// </summary>
-        public decimal? fixed_assets { get; set; }
-
-
-        /// <summary>
-        /// 短期借款
-        /// </summary>
-        public decimal? short_term_borrow { get; set; }
-
-
-        /// <summary>
-        /// 应付账款
-        /// </summary>
-        public decimal? accounts_payable { get; set; }
-
-
-        /// <summary>
-        /// 物流供应商应付账款
-        /// </summary>
-        public decimal? logistics_accounts_payable { get; set; }
-
-
-        /// <summary>
-        /// 成品供应商应付账款
-        /// </summary>
-        public decimal? finished_accounts_payable { get; set; }
-
-
-        /// <summary>
-        /// 半成品供应商应付账款
-        /// </summary>
-        public decimal? semi_accounts_payable { get; set; }
-
-
-        /// <summary>
-        /// 预收款项
-        /// </summary>
-        public decimal? advance_received { get; set; }
-
-
-        /// <summary>
-        /// 应付职工薪酬
-        /// </summary>
-        public decimal? payable_remuneration { get; set; }
-
-
-        /// <summary>
-        /// 应交税费
-        /// </summary>
-        public decimal? taxes_payable { get; set; }
-
-
-        /// <summary>
-        /// 其他应付款
-        /// </summary>
-        public decimal? other_accounts_payable { get; set; }
-
-
-        /// <summary>
-        /// 长期应付款
-        /// </summary>
-        public decimal? long_term_accounts_payable { get; set; }
-
-
+        
         /// <summary>
         /// 统计时间
         /// </summary>
@@ -321,12 +262,14 @@ namespace Bailun.DC.Models
         /// <summary>
         /// 其他流动资产
         /// </summary>
+        [Description("其他流动资产")]
         public decimal? fa_other_assets { get; set; }
 
 
         /// <summary>
         /// 流动资产合计
         /// </summary>
+        [Description("流动资产合计")]
         public decimal? fa_count { get; set; }
 
 
@@ -351,6 +294,7 @@ namespace Bailun.DC.Models
         /// <summary>
         /// 长期股权投资
         /// </summary>
+        [Description("长期股权投资")]
         public decimal? nca_longterm_equity_investment { get; set; }
 
 
@@ -373,6 +317,12 @@ namespace Bailun.DC.Models
 
 
         /// <summary>
+        /// 固定资产
+        /// </summary>
+        [Description("固定资产")]
+        public decimal? fixed_assets { get; set; }
+
+        /// <summary>
         /// 固定资产清理
         /// </summary>
         public decimal? nca_disposal_of_fixed_assets { get; set; }
@@ -393,6 +343,7 @@ namespace Bailun.DC.Models
         /// <summary>
         /// 无形资产
         /// </summary>
+        [Description("无形资产")]
         public decimal? nca_intangible_assets { get; set; }
 
 
@@ -411,6 +362,7 @@ namespace Bailun.DC.Models
         /// <summary>
         /// 长期待摊费用
         /// </summary>
+        [Description("长期待摊费用")]
         public decimal? nca_longterm_unamortized_expenses { get; set; }
 
 
@@ -429,14 +381,78 @@ namespace Bailun.DC.Models
         /// <summary>
         /// 非流动资产合计
         /// </summary>
+        [Description("非流动资产合计")]
         public decimal? nca_count { get; set; }
 
 
         /// <summary>
         /// 资产合计
         /// </summary>
+        [Description("资产合计")]
         public decimal? count_assets { get; set; }
 
+        /// <summary>
+        /// 短期借款
+        /// </summary>
+        [Description("短期借款")]
+        public decimal? short_term_borrow { get; set; }
+
+
+        /// <summary>
+        /// 应付账款
+        /// </summary>
+        [Description("应付账款")]
+        public decimal? accounts_payable { get; set; }
+
+
+        /// <summary>
+        /// 物流供应商应付账款
+        /// </summary>
+        public decimal? logistics_accounts_payable { get; set; }
+
+
+        /// <summary>
+        /// 成品供应商应付账款
+        /// </summary>
+        public decimal? finished_accounts_payable { get; set; }
+
+
+        /// <summary>
+        /// 半成品供应商应付账款
+        /// </summary>
+        public decimal? semi_accounts_payable { get; set; }
+
+
+        /// <summary>
+        /// 预收款项
+        /// </summary>
+        [Description("预收款项")]
+        public decimal? advance_received { get; set; }
+
+
+        /// <summary>
+        /// 应付职工薪酬
+        /// </summary>
+        [Description("应付职工薪酬")]
+        public decimal? payable_remuneration { get; set; }
+
+
+        /// <summary>
+        /// 应交税费
+        /// </summary>
+        [Description("应交税费")]
+        public decimal? taxes_payable { get; set; }
+
+
+        
+
+
+        /// <summary>
+        /// 长期应付款
+        /// </summary>
+        public decimal? long_term_accounts_payable { get; set; }
+
+
 
         /// <summary>
         /// 交易性金融负债
@@ -453,36 +469,47 @@ namespace Bailun.DC.Models
         /// <summary>
         /// 应付利息
         /// </summary>
+        [Description("应付利息")]
         public decimal? cl_payable_interest { get; set; }
 
 
         /// <summary>
         /// 应付股利
         /// </summary>
+        [Description("应付股利")]
         public decimal? cl_dividends_payable { get; set; }
 
+        /// <summary>
+        /// 其他应付款
+        /// </summary>
+        [Description("其他应付款")]
+        public decimal? other_accounts_payable { get; set; }
 
         /// <summary>
         /// 一年内到期的非流动负债
         /// </summary>
+        [Description("一年内到期的非流动负债")]
         public decimal? cl_oneyear_noncurrent_liabilities { get; set; }
 
 
         /// <summary>
         /// 其他流动负债
         /// </summary>
+        [Description("其他流动负债")]
         public decimal? cl_other_liabilities { get; set; }
 
 
         /// <summary>
         /// 流动负债合计
         /// </summary>
+        [Description("流动负债合计")]
         public decimal? cl_count { get; set; }
 
 
         /// <summary>
         /// 长期借款
         /// </summary>
+        [Description("长期借款")]
         public decimal? ncl_longterm_loan { get; set; }
 
 
@@ -501,42 +528,49 @@ namespace Bailun.DC.Models
         /// <summary>
         /// 预计负债
         /// </summary>
+        [Description("预计负债")]
         public decimal? ncl_anticipation_liabilities { get; set; }
 
 
         /// <summary>
         /// 递延所得税负债
         /// </summary>
+        [Description("递延所得税负债")]
         public decimal? ncl_deferred_income_tax_liabilities { get; set; }
 
 
         /// <summary>
         /// 其他非流动负债
         /// </summary>
+        [Description("其他非流动负债")]
         public decimal? ncl_other_liabilities { get; set; }
 
 
         /// <summary>
         /// 非流动负债合计
         /// </summary>
+        [Description("非流动负债合计")]
         public decimal? ncl_count { get; set; }
 
 
         /// <summary>
         /// 负债合计
         /// </summary>
+        [Description("负债合计")]
         public decimal? count_liabilities { get; set; }
 
 
         /// <summary>
         /// 实收资本
         /// </summary>
+        [Description("实收资本")]
         public decimal? oe_paicl_up_capital { get; set; }
 
 
         /// <summary>
         /// 资本公积
         /// </summary>
+        [Description("资本公积")]
         public decimal? oe_capital_reserve { get; set; }
 
 
@@ -549,24 +583,28 @@ namespace Bailun.DC.Models
         /// <summary>
         /// 盈余公积
         /// </summary>
+        [Description("盈余公积")]
         public decimal? oe_surplus_public_accumulation { get; set; }
 
 
         /// <summary>
         /// 未分配利润
         /// </summary>
+        [Description("未分配利润")]
         public decimal? oe_undistributed_profit { get; set; }
 
 
         /// <summary>
         /// 所有者权益合计
         /// </summary>
+        [Description("所有者权益合计")]
         public decimal? oe_count { get; set; }
 
 
         /// <summary>
         /// 负债和所有者权益合计
         /// </summary>
+        [Description("负债和所有者权益合计")]
         public decimal? count_liabilities_and_oe { get; set; }
 
 

Bailun.DC.Services/BalanceSheetServices.cs

@@ -142,6 +142,164 @@ namespace Bailun.DC.Services
             return list.OrderBy(a => a.statistical_time).ToList();
         }
 
+        public List<dc_balance_sheet_new_result> GetBalanceSheetNew(int type, DateTime date, int paycompayvalue)
+        {
+            var count = 6;
+            var dt = new List<string>();
+            var currentDay = DateTime.Parse(date.ToShortDateString());
+            dt.Add(currentDay.ToString("yyyy-MM-dd"));
+
+            for (var i = 1; i <= count; i++)
+            {
+                var d = currentDay;
+                if (type == 2)
+                {
+                    d = currentDay.AddDays(-(i * 7));
+                }
+                else if (type == 3)
+                {
+                    d = DateTime.Parse(currentDay.AddMonths((1 - i)).ToString("yyyy-MM") + "-01").AddDays(-1);
+
+                    //currentDay.AddMonths(-i);
+                }
+                else if (type == 4)
+                {
+                    d = currentDay.AddYears(-i);
+                }
+                else
+                {
+                    d = currentDay.AddDays(-i);
+                }
+
+                dt.Add(d.ToString("yyyy-MM-dd"));
+            }
+
+            var str = string.Join("','", dt);
+
+            var sql = "select * from dc_balance_sheet_new_result where company_value=" + paycompayvalue + " and statistical_time in ('" + str + "')  order by statistical_time";
+            var list = new List<dc_balance_sheet_new_result>();
+            using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
+            {
+                if (cn.State == ConnectionState.Closed)
+                {
+                    cn.Open();
+                }
+
+                list = cn.Query<dc_balance_sheet_new_result>(sql).AsList();
+            }
+
+            if (list.Count < dt.Count)
+            {
+                if (list.Count == 0)
+                {
+                    list = new List<dc_balance_sheet_new_result>();
+                }
+
+                foreach (var item in dt)
+                {
+                    var m = list.Where(a => a.statistical_time.ToString("yyyy-MM-dd") == item).FirstOrDefault();
+                    if (m == null)
+                    {
+                        m = new dc_balance_sheet_new_result()
+                        {
+                            accounts_payable = 0,
+                            accounts_receivable = 0,
+                            advance_received = 0,
+                            cl_count = 0,
+                            cl_dividends_payable = 0,
+                            cl_notes_payable = 0,
+                            cl_oneyear_noncurrent_liabilities = 0,
+                            cl_other_liabilities = 0,
+                            cl_payable_interest = 0,
+                            cl_trading_financ_liabilities = 0,
+                            company_name = "",
+                            company_value = paycompayvalue,
+                            count_assets = 0,
+                            count_liabilities = 0,
+                            count_liabilities_and_oe = 0,
+                            fa_bill_receivable = 0,
+                            fa_count = 0,
+                            fa_dividends_receivable = 0,
+                            fa_interest_receivable = 0,
+                            fa_oneyear_noncurrent_assets = 0,
+                            fa_other_assets = 0,
+                            fa_trading_finan_asset = 0,
+                            fixed_assets = 0,
+                            inventory_amount = 0,
+                            long_term_accounts_payable = 0,
+                            monetary_fund = 0,
+                            nca_avai_for_sale_fassets = 0,
+                            nca_construction_in_process = 0,
+                            nca_count = 0,
+                            nca_deferred_tax_assets = 0,
+                            nca_development_expenditure = 0,
+                            nca_disposal_of_fixed_assets = 0,
+                            nca_engineering_material = 0,
+                            nca_goodwill = 0,
+                            nca_heldon_investment = 0,
+                            nca_intangible_assets = 0,
+                            nca_investment_property = 0,
+                            nca_longterm_equity_investment = 0,
+                            nca_longterm_receivable = 0,
+                            nca_longterm_unamortized_expenses = 0,
+                            nca_oil_and_gas_assets = 0,
+                            nca_other_assets = 0,
+                            nca_productive_biological_asset = 0,
+                            ncl_anticipation_liabilities = 0,
+                            ncl_bonds_payable = 0,
+                            ncl_count = 0,
+                            ncl_deferred_income_tax_liabilities = 0,
+                            ncl_longterm_loan = 0,
+                            ncl_other_liabilities = 0,
+                            ncl_special_payable = 0,
+                            oe_capital_reserve = 0,
+                            oe_count = 0,
+                            oe_inventory_amount = 0,
+                            oe_paicl_up_capital = 0,
+                            oe_surplus_public_accumulation = 0,
+                            oe_undistributed_profit = 0,
+                            other_accounts_payable = 0,
+                            other_accounts_receivable = 0,
+                            payable_remuneration = 0,
+                            prepayment = 0,
+                            short_term_borrow = 0,
+                            statistical_time = DateTime.Parse(item),
+                            taxes_payable = 0,
+                            update_time = DateTime.Now,
+
+                            bank_account_balance = 0,
+                            withdraw_amount = 0,
+                            platform_balance = 0,
+                            logistics_prepayment = 0,
+                            finished_prepayment = 0,
+                            semi_prepayment = 0,
+
+                            fba_inventory_amount = 0,
+                            not_fba_inventory_amount = 0,
+                            fba_transfer_amount = 0,
+                            not_fba_transfer_amount = 0,
+                            semi_inventory_amount = 0,
+                            semi_transfer_amount = 0,
+
+                            logistics_accounts_payable = 0,
+                            finished_accounts_payable = 0,
+                            semi_accounts_payable = 0,
+
+                            amount_borrowed = 0,
+
+                            purchase_pro_amount = 0,
+
+                        };
+
+                        list.Add(m);
+                    }
+                }
+            }
+
+            return list.OrderBy(a => a.statistical_time).ToList();
+        }
+
+
         #endregion
 
     }

Bailun.DC.Services/FinanceReportServices.cs

@@ -20,6 +20,7 @@ namespace Bailun.DC.Services
         /// <param name="date">日期</param>
         /// <param name="paycompayvalue">付款主体id</param>
         /// <returns></returns>
+        
         public List<dc_balance_sheet> GetBalanceSheet(int type, DateTime date, int paycompayvalue)
         {
             var count = 6;