dbug

parent 89150e7f
...@@ -47,6 +47,8 @@ public ActionsFilter(ILoggerFactory factory, IMemoryCache cache, IHostingEnviron ...@@ -47,6 +47,8 @@ public ActionsFilter(ILoggerFactory factory, IMemoryCache cache, IHostingEnviron
return; return;
} }
//token验证 //token验证
if (!_env.IsDevelopment())
{
var arry = ((ControllerActionDescriptor)context.ActionDescriptor).MethodInfo.GetCustomAttributes(typeof(NoVerifyAttribute), true); var arry = ((ControllerActionDescriptor)context.ActionDescriptor).MethodInfo.GetCustomAttributes(typeof(NoVerifyAttribute), true);
if (arry.Length == 0) if (arry.Length == 0)
{ {
...@@ -59,6 +61,7 @@ public ActionsFilter(ILoggerFactory factory, IMemoryCache cache, IHostingEnviron ...@@ -59,6 +61,7 @@ public ActionsFilter(ILoggerFactory factory, IMemoryCache cache, IHostingEnviron
return; return;
} }
} }
}
//验证请求参数 //验证请求参数
if (!context.ModelState.IsValid) if (!context.ModelState.IsValid)
{ {
......
...@@ -163,8 +163,9 @@ public List<ComputeResult> Compute(List<ComputeEmployee> empolyeeList, List<res_ ...@@ -163,8 +163,9 @@ public List<ComputeResult> Compute(List<ComputeEmployee> empolyeeList, List<res_
var value = workyearList.FirstOrDefault(t => t.MinRange < years && years <= t.MaxRange)?.Value; var value = workyearList.FirstOrDefault(t => t.MinRange < years && years <= t.MaxRange)?.Value;
compute.WorkYear = value; compute.WorkYear = value;
} }
compute.GiveFee = baiscnorm * compute.PostCoefficient * compute.Attendance * compute.ScoreAverageRate * (compute.WorkYear ?? 1) + (compute.OtherPerfor ?? 0) + (item.Workload ?? 0) + (compute.Punishment ?? 0);
//应发绩效 //应发绩效
compute.GiveFee = baiscnorm * compute.PostCoefficient * compute.Attendance * compute.ScoreAverageRate * (compute.WorkYear ?? 1) + (compute.OtherPerfor ?? 0) + (item.Workload ?? 0) + (compute.Punishment ?? 0);
//实发绩效
compute.RealGiveFee = compute.GiveFee * item.Adjust * item.Grant; compute.RealGiveFee = compute.GiveFee * item.Adjust * item.Grant;
computeList.Add(compute); computeList.Add(compute);
} }
......
...@@ -212,8 +212,7 @@ private void CommonExport(int sheetID, SheetExportResponse response) ...@@ -212,8 +212,7 @@ private void CommonExport(int sheetID, SheetExportResponse response)
} }
else if (!rowbody.Data.Any(t => t.PointCell == head.PointCell)) else if (!rowbody.Data.Any(t => t.PointCell == head.PointCell))
{ {
var accountingUnit = dataList.FirstOrDefault(t => t.RowNumber == rowNumber)?.AccountingUnit; var data = dataList.FirstOrDefault(t => t.RowNumber == rowNumber && t.SignID == head.SignID);
var data = dataList.FirstOrDefault(t => t.AccountingUnit == accountingUnit && t.SignID == head.SignID);
var value = data?.CellValue; var value = data?.CellValue;
if (value.HasValue && value.Value > 0) if (value.HasValue && value.Value > 0)
rowbody.Data.Add(new Cell(head.PointCell.Value, value, 1, 1, data.IsTotal == 1, true, data.Annotation)); rowbody.Data.Add(new Cell(head.PointCell.Value, value, 1, 1, data.IsTotal == 1, true, data.Annotation));
......
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