Commit ba3c6f3d by guanzhenshan

解决管理成本无法查看4千里明细的问题

parent b3c4f55c
...@@ -712,10 +712,19 @@ namespace Bailun.DC.Services ...@@ -712,10 +712,19 @@ namespace Bailun.DC.Services
if (!string.IsNullOrEmpty(departmentname)) if (!string.IsNullOrEmpty(departmentname))
{ {
if (departmentname == "四千里主体")
{
//72, 67, 58, 54, 78
sql += " and company_value in (72, 67, 58, 54, 78)";
}
else
{
sql += " and department_name=@department_name"; sql += " and department_name=@department_name";
sqlparam.Add("department_name", departmentname); sqlparam.Add("department_name", departmentname);
} }
}
if (paycompanyid.HasValue && paycompanyid.Value > 0) if (paycompanyid.HasValue && paycompanyid.Value > 0)
{ {
...@@ -731,9 +740,9 @@ namespace Bailun.DC.Services ...@@ -731,9 +740,9 @@ namespace Bailun.DC.Services
{ {
sql += " and company_value=" + paycompanyid.Value; sql += " and company_value=" + paycompanyid.Value;
} }
}
}
using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString)) using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
{ {
......
...@@ -628,7 +628,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -628,7 +628,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
if (list.Count > 0) if (list.Count > 0)
{ {
var list4K = new List<int>() { 72, 67, 58, 54 }; var list4K = new List<int>() { 72, 67, 58, 54, 78 };
if (t == 2) //按付款主体 if (t == 2) //按付款主体
{ {
listCol = list.GroupBy(a => a.company_name).Select(p => p.Key).OrderBy(a=>a).ToList(); listCol = list.GroupBy(a => a.company_name).Select(p => p.Key).OrderBy(a=>a).ToList();
...@@ -641,6 +641,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -641,6 +641,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
listCol.Remove("深圳市四千里数据科技有限公司"); listCol.Remove("深圳市四千里数据科技有限公司");
listCol.Remove("4Kmiles tec Limited"); listCol.Remove("4Kmiles tec Limited");
listCol.Remove("广州四千里数据科技有限公司"); listCol.Remove("广州四千里数据科技有限公司");
listCol.Remove("(英国)4kmiles technologies ltd");
listCol.Add("四千里主体"); listCol.Add("四千里主体");
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment