管理成本增加4千里主体数据

Bailun.DC.Services/FinanceReportServices.cs

@@ -723,6 +723,10 @@ namespace Bailun.DC.Services
                 {
                     sql += " and company_value in (53,59,60,61,66)";
                 }
+                else if (paycompanyid.Value == 54)  //四千里
+                {
+                    sql += " and company_value in (72, 67, 58, 54)";
+                }
                 else
                 {
                     sql += " and company_value=" + paycompanyid.Value;

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

@@ -628,10 +628,22 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
 
             if (list.Count > 0)
             {
+                var list4K = new List<int>() { 72, 67, 58, 54 };
                 if (t == 2)  //按付款主体
                 {
                     listCol = list.GroupBy(a => a.company_name).Select(p => p.Key).OrderBy(a=>a).ToList();
+
+                    //对四千里主体的数据进行合并处理，四千里的主体包括：香港四千里数据科技有限公司(72),深圳市四千里数据科技有限公司(67),4Kmiles tec Limited(58),广州四千里数据科技有限公司(54)
                     
+                    if (list.Where(a => list4K.Contains(a.company_value)).Count() > 0)
+                    {
+                        listCol.Remove("香港四千里数据科技有限公司");
+                        listCol.Remove("深圳市四千里数据科技有限公司");
+                        listCol.Remove("4Kmiles tec Limited");
+                        listCol.Remove("广州四千里数据科技有限公司");
+
+                        listCol.Add("四千里主体");
+                    }
                 }
                 else  //按部门
                 {
@@ -644,7 +656,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                     {
                         if (t == 2)  //按付款主体
                         {
-                            if (item.company_name == listCol[i])
+                            if (item.company_name == listCol[i] || (list4K.Contains(item.company_value) && listCol[i]== "四千里主体"))
                             {
                                 var obj = listValue.Where(a => a.Item1 == item.fee_super_type).FirstOrDefault();
 
@@ -909,8 +921,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                     }
                 }
 
-
-
+                
                 //手续费支出
                 if (listHandleFee.Count > 0)
                 {
@@ -1234,13 +1245,21 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                 }
                 else
                 {
-                    var val = -1;
-                    var objPayCompany = new Services.FinanceReportServices().GetPayCompanyByName(headname);
-
-                    if (objPayCompany != null)
+                    if (headname == "四千里主体")  //四千里
                     {
-                        paycompanyid = objPayCompany.company_value;
+                        paycompanyid = 54;
                     }
+                    else
+                    {
+                        var val = -1;
+                        var objPayCompany = new Services.FinanceReportServices().GetPayCompanyByName(headname);
+
+                        if (objPayCompany != null)
+                        {
+                            paycompanyid = objPayCompany.company_value;
+                        }
+                    }
+                    
                 }
 
             }