BUG修复

parent e1f5161f
...@@ -220,7 +220,7 @@ public ApiResponse Generate([CustomizeValidator(RuleSet = "Delete"), FromBody] A ...@@ -220,7 +220,7 @@ public ApiResponse Generate([CustomizeValidator(RuleSet = "Delete"), FromBody] A
[HttpPost] [HttpPost]
public ApiResponse Recalculation([FromBody] RecalculationRequest request) public ApiResponse Recalculation([FromBody] RecalculationRequest request)
{ {
if (request.Money.HasValue && request.Money.Value > 0) if (request.Money.HasValue)
_allotService.Recalculation(request.AllotId, request.Money.Value); _allotService.Recalculation(request.AllotId, request.Money.Value);
return new ApiResponse(ResponseType.OK); return new ApiResponse(ResponseType.OK);
} }
......
...@@ -481,6 +481,7 @@ public void Recalculation(int allotId, decimal money) ...@@ -481,6 +481,7 @@ public void Recalculation(int allotId, decimal money)
if (computResult == null) return; if (computResult == null) return;
baiscnormList = baiscNormService.ComputeOtherAvg(baiscnormList, computResult, empolyeeList); baiscnormList = baiscNormService.ComputeOtherAvg(baiscnormList, computResult, empolyeeList);
baiscnormList.ForEach(t => t.AllotID = allot.ID);
var historyRescompute = _perforRescomputeRepository.GetEntities(w => w.AllotID == allotId && w.AccountType == AccountUnitType.行政高层.ToString()); var historyRescompute = _perforRescomputeRepository.GetEntities(w => w.AllotID == allotId && w.AccountType == AccountUnitType.行政高层.ToString());
if (historyRescompute != null && historyRescompute.Any()) if (historyRescompute != null && historyRescompute.Any())
......
...@@ -821,6 +821,8 @@ public DeptDataDetails<DetailModuleExtend> DeptDetail(int accountId) ...@@ -821,6 +821,8 @@ public DeptDataDetails<DetailModuleExtend> DeptDetail(int accountId)
private decimal? GetFactors(List<per_sheet> persheet, List<im_data> basicData, UnitType type, SheetType sheetType) private decimal? GetFactors(List<per_sheet> persheet, List<im_data> basicData, UnitType type, SheetType sheetType)
{ {
var sheet = persheet.FirstOrDefault(w => w.SheetType == (int)sheetType); var sheet = persheet.FirstOrDefault(w => w.SheetType == (int)sheetType);
if (sheet == null)
return null;
return basicData.FirstOrDefault(t => t.SheetID == sheet.ID && t.UnitType == (int)type && t.IsTotal == 1)?.CellValue; return basicData.FirstOrDefault(t => t.SheetID == sheet.ID && t.UnitType == (int)type && t.IsTotal == 1)?.CellValue;
} }
......
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