调整管理成本明细，改为从库表读取

Bailun.DC.Services/FinanceReportServices.cs

@@ -253,7 +253,7 @@ namespace Bailun.DC.Services
         /// <param name="start">付款开始时间</param>
         /// <param name="end">付款结束时间</param>
         /// <returns></returns>
-        public List<Models.dc_base_finance_managecost> ListFinanceManageCost(DateTime start,DateTime end,string feesupertype,int? paycompanyid)
+        public List<Models.dc_base_finance_managecost> ListFinanceManageCost(DateTime start,DateTime end,string feesupertype,string feesubtype,string departmentname, int? paycompanyid)
         {
             var sqlparam = new DynamicParameters();
             var list = new List<Models.dc_base_finance_managecost>();
@@ -266,6 +266,19 @@ namespace Bailun.DC.Services
                 sqlparam.Add("type", feesupertype);
             }
 
+            if (!string.IsNullOrEmpty(feesubtype))
+            {
+                sql += " and fee_sub_type=@subtype";
+                sqlparam.Add("subtype", feesubtype);
+            }
+
+            if (!string.IsNullOrEmpty(departmentname))
+            {
+                sql += " and department_name=@department_name";
+                sqlparam.Add("department_name", departmentname);
+            }
+
+
             if (paycompanyid.HasValue && paycompanyid.Value > 0)
             {
                 sql += " and company_value="+paycompanyid.Value;

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

@@ -392,7 +392,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
             var listInterest = new Services.FinanceReportServices().ListInterestExpense(cwurl);
 
             //Edit by Allan at 20191217 for 更改数据源
-            var list = new Services.FinanceReportServices().ListFinanceManageCost(start,end,"",paycompanyid); //new Services.FinanceReportServices().ListOtherCost(url);  
+            var list = new Services.FinanceReportServices().ListFinanceManageCost(start,end,"","","",paycompanyid); //new Services.FinanceReportServices().ListOtherCost(url);  
             var listValue = new List<Tuple<string, List<decimal>>>();
             var listCol = new List<string>();
             var listColVal = new List<int>();
@@ -728,7 +728,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                 url += "&feeSuperType=" + categoryname;
             }
 
-            var list = new Services.FinanceReportServices().ListFinanceManageCost(start, end, categoryname, paycompanyid);//new Services.FinanceReportServices().ListOtherCost(url);
+            var list = new Services.FinanceReportServices().ListFinanceManageCost(start, end, categoryname,"","", paycompanyid);//new Services.FinanceReportServices().ListOtherCost(url);
             var listValue = new List<Tuple<string, List<decimal>>>();
             var listCol = heads.Split("|").ToList();
 
@@ -823,20 +823,20 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
         /// <returns></returns>
         public string ListAdministrativeCostJson(DateTime start, DateTime end, int? paycompanyid, string headname, string categoryname, int type, int issub)
         {
-            var url = ConfigHelper.GetByName("FeeUrl") + "?o=0";
+            //var url = ConfigHelper.GetByName("FeeUrl") + "?o=0";
 
-            url += "&startDate=" + start.ToString("yyyy-MM-dd") + "&endDate=" + end.ToString("yyyy-MM-dd");
+            //url += "&startDate=" + start.ToString("yyyy-MM-dd") + "&endDate=" + end.ToString("yyyy-MM-dd");
 
-            if (paycompanyid.HasValue && paycompanyid.Value>0)
-            {
-                url += "&companyValue=" + paycompanyid.Value;
-            }
+            //if (paycompanyid.HasValue && paycompanyid.Value>0)
+            //{
+            //    url += "&companyValue=" + paycompanyid.Value;
+            //}
 
             if (!string.IsNullOrEmpty(headname))
             {
                 if (type == 1)
                 {
-                    url += "&departmentName=" + headname;
+                    //url += "&departmentName=" + headname;
                 }
                 else
                 {
@@ -845,40 +845,41 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
 
                     if (objPayCompany != null)
                     {
-                        val = objPayCompany.company_value;
+                        paycompanyid = objPayCompany.company_value;
                     }
-
-                    url += "&companyValue="+ val;
                 }
 
             }
 
-            if (!string.IsNullOrEmpty(categoryname))
-            {
-                if (issub == 0)
-                {
-                    url += "&feeSuperType=" + categoryname;
-                }
-                else
-                {
-                    url += "&feeSubType=" + categoryname;
-                }
+            //if (!string.IsNullOrEmpty(categoryname))
+            //{
+            //    if (issub == 0)
+            //    {
+            //        url += "&feeSuperType=" + categoryname;
+            //    }
+            //    else
+            //    {
+            //        url += "&feeSubType=" + categoryname;
+            //    }
 
-            }
+            //}
+
+            //var obj = new Services.FinanceReportServices().ListOtherCost(url);
+
+            var obj = new Services.FinanceReportServices().ListFinanceManageCost(start, end, (issub == 0 ? categoryname : ""), (issub != 0 ? categoryname : ""), (type==1?headname:""), paycompanyid);
 
-            var obj = new Services.FinanceReportServices().ListOtherCost(url);
 
             if (obj.Count > 0)
             {
-                var m = new Models.Api.mOtherFee {
+                var m = new Models.dc_base_finance_managecost {
                     no = "",
-                    companyName = "",
+                    company_name = "",
                     amount = obj.Sum(a => a.amount),
-                    amountRmb = obj.Sum(a => a.amountRmb),
+                    amount_rmb = obj.Sum(a => a.amount_rmb),
                     currency = "",
-                    departmentName = "",
-                    feeSubType = "",
-                    feeSuperType = "合计",
+                    department_name = "",
+                    fee_sub_type = "",
+                    fee_super_type = "合计",
                 };
 
                 obj.Add(m);
@@ -886,17 +887,17 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
 
             var list = obj.Select(a => new {
                 amount = a.amount.ToString("###,###.##"),
-                amountRmb = a.amountRmb.ToString("###,###.##"),
-                a.companyName,
+                amountRmb = a.amount_rmb.ToString("###,###.##"),
+                companyName = a.company_name,
                 a.currency,
-                a.departmentName,
-                a.feeSubType,
-                a.feeSuperType,
+                departmentName = a.department_name,
+                feeSubType = a.fee_sub_type,
+                feeSuperType = a.fee_super_type,
                 a.no,
-                a.manageCostType,
-                a.receiveUnit,
+                manageCostType = a.manage_cost_type,
+                receiveUnit = a.receive_unit,
                 a.reason,
-                payTime = a.payTime.HasValue?a.payTime.Value.ToString("yyyy-MM-dd HH:mm:ss"):""
+                payTime = a.pay_time.HasValue?a.pay_time.Value.ToString("yyyy-MM-dd HH:mm:ss"):""
             }).ToList();