增加需求:付现流水报表增加所属项目和所属账期

Bailun.DC.Models/dc_base_finance_fee.cs

@@ -344,5 +344,15 @@ namespace Bailun.DC.Models
         /// 部门名称
         /// </summary>
         public string department_name { get; set; }
+
+        /// <summary>
+        /// 所属项目
+        /// </summary>
+        public string project { get; set; }
+
+        /// <summary>
+        /// 所属账期
+        /// </summary>
+        public DateTime? project_date { get; set; }
     }
 }

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

@@ -2127,7 +2127,9 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                 receiveUnit = a.bank_company,
                 reason = string.IsNullOrEmpty(a.cost_reason) ? a.cost_remark : a.cost_reason,
                 payTime = a.pay_time.HasValue ? a.pay_time.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
-                uid = user != null ? user.GetUid() : 0
+                uid = user != null ? user.GetUid() : 0,
+                project = a.project,
+                projectDate = a.project_date.HasValue ? a.project_date.Value.ToString("yyyy-MM") : ""
             }).ToList();
 
 
@@ -2488,13 +2490,13 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
 
             var colNames = new List<string> {"费用单号","部门名称","付款主体名称","费用类别", "会计科目",
                                             "金额","币种", "人民币金额","收款单位","收款理由","付款时间",
-                                            "备注" };
+                                            "所属项目","所属账期","备注" };
 
             var list = new List<string>();
             foreach (var item in obj)
             {
                 list.Add(item.cost_no + "|" + item.department_name + "|" + item.company_name + "|" + item.type_name + "|" + item.accounting_subject_name + "|" +
-                    item.amount + "|" + item.dic + "|" + item.amount_rmb + "|" + item.bank_company + "|" + (string.IsNullOrEmpty(item.cost_reason) ? item.cost_remark : item.cost_reason) + "|" + item.pay_time.Value.ToString("yyyy-MM-dd HH:mm:ss" + "|" + item.mor_remark)
+                    item.amount + "|" + item.dic + "|" + item.amount_rmb + "|" + item.bank_company + "|" + (string.IsNullOrEmpty(item.cost_reason) ? item.cost_remark : item.cost_reason) + "|" + (item.pay_time.HasValue ? item.pay_time.Value.ToString("yyyy-MM-dd HH:mm:ss") : string.Empty) + "|" + item.project + "|" + (item.project_date.HasValue ? $"\t{item.project_date.Value.ToString("yyyy-MM")}" : string.Empty) + "|" + item.mor_remark
                     );
             }