Commit e285b8b2 by Licx

行政中层管理绩效展示

parent 99921a57
...@@ -2416,8 +2416,10 @@ public List<DeptDataDetails> DeptComputeDetailList(int userId, int allotId, out ...@@ -2416,8 +2416,10 @@ public List<DeptDataDetails> DeptComputeDetailList(int userId, int allotId, out
{ (int)Role.特殊科室, new List<string> { AccountUnitType.科主任.ToString() , AccountUnitType.护士长.ToString() } }, { (int)Role.特殊科室, new List<string> { AccountUnitType.科主任.ToString() , AccountUnitType.护士长.ToString() } },
}; };
int roleType = userInfo?.URole.Type ?? 0;
var accountTypes = userInfo != null && dict.ContainsKey(roleType) ? dict[roleType] : new List<string>();
var computes = rescomputeRepository.GetEntities(t => t.AllotID == allotId && t.AccountingUnit == accountingUnit && unitTypes.Contains(t.UnitType)); var computes = rescomputeRepository.GetEntities(t => t.AllotID == allotId && t.AccountingUnit == accountingUnit && (unitTypes.Contains(t.UnitType) || accountTypes.Contains(t.AccountType)));
if (computes == null || !computes.Any()) return new List<DeptDataDetails>(); if (computes == null || !computes.Any()) return new List<DeptDataDetails>();
foreach (var item in computes) foreach (var item in computes)
{ {
...@@ -2505,7 +2507,7 @@ private List<SecondPerforResponse> GetAllotPerformance(int allotId, List<res_com ...@@ -2505,7 +2507,7 @@ private List<SecondPerforResponse> GetAllotPerformance(int allotId, List<res_com
public ApiResponse Import(IFormCollection form) public ApiResponse Import(IFormCollection form)
{ {
var secondid = form.ToDictionary().GetValue("secondid", 0); var secondid = form.ToDictionary().GetValue("secondid", 0);
var agsecondallot = agsecondallotRepository.GetEntity(t => t.Id == secondid); var agsecondallot = agsecondallotRepository.GetEntity(t => t.Id == secondid);
if (agsecondallot == null) if (agsecondallot == null)
return new ApiResponse(ResponseType.Fail, "secondid不存在"); return new ApiResponse(ResponseType.Fail, "secondid不存在");
......
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