Skip to content

P
performance
Commit 0a06e354 by 纪旭 韦
Options

修改汇总表列头

parent 88c0b969
Showing with 16 additions and 18 deletions
performance/Performance.Api/wwwroot/Performance.EntityModels.xml
...@@ -1695,6 +1695,11 @@ ...@@ -1695,6 +1695,11 @@
状态 1 可用 0 禁用 状态 1 可用 0 禁用
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.cof_alias.SumStatus">
<summary>
状态 1 求和 0 不求和
</summary>
</member>
<member name="T:Performance.EntityModels.cof_check"> <member name="T:Performance.EntityModels.cof_check">
<summary> <summary>
上传excel文件校验配置 上传excel文件校验配置
......
performance/Performance.DtoModels/Request/ComputerRequest.cs
...@@ -94,13 +94,8 @@ public class GetPage ...@@ -94,13 +94,8 @@ public class GetPage
} }
public class QueryComputeByDateGetTotal: GetPage public class QueryComputeByDateGetTotal: GetPage
{ {
public List<Head> Head { get; set; } public List<cof_alias> Head { get; set; }
public List<dynamic> Data { get; set; } public List<dynamic> Data { get; set; }
public decimal TotalData { get; set; }} public decimal TotalData { get; set; }}
} }
public class Head
{
public string Name { get; set; }
public string Alias { get; set; }
}
performance/Performance.Services/ComputeService.cs
...@@ -2098,21 +2098,10 @@ public QueryComputeByDateGetTotal GetPerformanceSummary(HospitalGrantSummary req ...@@ -2098,21 +2098,10 @@ public QueryComputeByDateGetTotal GetPerformanceSummary(HospitalGrantSummary req
List<cof_alias> AllComputeView = ComputeConfig.AllComputeView.ToList(); List<cof_alias> AllComputeView = ComputeConfig.AllComputeView.ToList();
List<Head> head = new List<Head>();
if ((request.GroupBy != null && request.GroupBy.Any(t => !string.IsNullOrEmpty(t))) && if ((request.GroupBy != null && request.GroupBy.Any(t => !string.IsNullOrEmpty(t))) &&
(request.SumBy != null && request.SumBy.Any(t => !string.IsNullOrEmpty(t)))) (request.SumBy != null && request.SumBy.Any(t => !string.IsNullOrEmpty(t))))
AllComputeView = ComputeConfig.AllComputeView.Where(t => headlist.Contains(t.Name.ToLower())).ToList(); AllComputeView = ComputeConfig.AllComputeView.Where(t => headlist.Contains(t.Name.ToLower())).ToList();
foreach (var item in AllComputeView)
{
Head head1 = new Head()
{
Name = item.Name,
Alias = item.Alias
};
head.Add(head1);
}
decimal TotalData = 0; decimal TotalData = 0;
...@@ -2128,7 +2117,7 @@ public QueryComputeByDateGetTotal GetPerformanceSummary(HospitalGrantSummary req ...@@ -2128,7 +2117,7 @@ public QueryComputeByDateGetTotal GetPerformanceSummary(HospitalGrantSummary req
var list = new QueryComputeByDateGetTotal var list = new QueryComputeByDateGetTotal
{ {
Head = head, Head = AllComputeView,
Data = datas, Data = datas,
TotalData = TotalData, TotalData = TotalData,
TotalCount = TotalCount, TotalCount = TotalCount,
...@@ -2182,6 +2171,15 @@ public class ComputeConfig ...@@ -2182,6 +2171,15 @@ public class ComputeConfig
{ {
public static List<cof_alias> PerformanceTotal(string route,string[] heads) public static List<cof_alias> PerformanceTotal(string route,string[] heads)
{ {
if (heads == null)
{
if (route == "/report/wholehospital_grant_summary")
return AllComputeView.ToList();
if (route == "/report/wholehospital_accounting_grant_summary")
return AllComputeDepartmentView.ToList();
if (route == "/report/wholehospital_finance_grant_summary")
return AllComputePersonView.ToList();
}
if (route== "/report/wholehospital_grant_summary") if (route== "/report/wholehospital_grant_summary")
return AllComputeView.Where(t => heads.Contains(t.Name.ToLower())).ToList(); return AllComputeView.Where(t => heads.Contains(t.Name.ToLower())).ToList();
if (route == "/report/wholehospital_accounting_grant_summary") if (route == "/report/wholehospital_accounting_grant_summary")
......
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