Commit 4efb4431 by 纪旭 韦

修复绩效核算3个接口异常问题

parent 327a87e0
diff a/performance/Performance.Api/Controllers/EmployeeController.cs b/performance/Performance.Api/Controllers/EmployeeController.cs (rejected hunks)
@@ -824,6 +824,7 @@
if (allotId <= 0)
return new ApiResponse(ResponseType.Fail, "参数错误", "allotid无效");
+ var result = employeeService.GetGatherTotal(allotId, request);
return new ApiResponse(ResponseType.OK, result);
}
...@@ -206,7 +206,8 @@ public List<ResComputeResponse> GetCompute(int allotId, int type) ...@@ -206,7 +206,8 @@ public List<ResComputeResponse> GetCompute(int allotId, int type)
} }
else else
{ {
var compute = _perforRescomputeRepository.GetEntities(t => t.AllotID == allotId && t.AccountType == items.FirstOrDefault(p => p.Value == type).Name); var name = items.FirstOrDefault(p => p.Value == type)?.Name ?? "";
var compute = _perforRescomputeRepository.GetEntities(t => t.AllotID == allotId && t.AccountType == name);
if (type == (int)AccountUnitType.行政工勤) if (type == (int)AccountUnitType.行政工勤)
compute = compute?.Where(w => w.NeedSecondAllot == "否")?.ToList(); compute = compute?.Where(w => w.NeedSecondAllot == "否")?.ToList();
......
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