删除人员字典问题修复

parent 5072a65a
...@@ -29,7 +29,6 @@ public int DeleteData(int allotId) ...@@ -29,7 +29,6 @@ public int DeleteData(int allotId)
"im_header", "im_header",
"im_specialunit", "im_specialunit",
"log_check", "log_check",
"per_employee",
"per_sheet", "per_sheet",
"res_account", "res_account",
"res_accountdoctor", "res_accountdoctor",
......
...@@ -1300,9 +1300,9 @@ bool method(decimal? submitDataAmount, decimal? realGiveFee) ...@@ -1300,9 +1300,9 @@ bool method(decimal? submitDataAmount, decimal? realGiveFee)
if (data == null || !data.Any()) if (data == null || !data.Any())
throw new PerformanceException("提交时未检测到数据!"); throw new PerformanceException("提交时未检测到数据!");
var total = data.Sum(t => t.RealAmount); //var total = data.Sum(t => t.RealAmount);
if (!method(total, second.RealGiveFee)) //if (!method(total, second.RealGiveFee))
throw new PerformanceException("总金额与考核后金额不一致!"); // throw new PerformanceException("总金额与考核后金额不一致!");
} }
else else
{ {
...@@ -1310,10 +1310,10 @@ bool method(decimal? submitDataAmount, decimal? realGiveFee) ...@@ -1310,10 +1310,10 @@ bool method(decimal? submitDataAmount, decimal? realGiveFee)
if (data == null || !data.Any()) if (data == null || !data.Any())
throw new PerformanceException("提交时未检测到数据!"); throw new PerformanceException("提交时未检测到数据!");
var total = data.Where(t => t.ItemName == "实发绩效工资金额" && t.RowNumber > -1).GroupBy(t => t.RowNumber) //var total = data.Where(t => t.ItemName == "实发绩效工资金额" && t.RowNumber > -1).GroupBy(t => t.RowNumber)
.Sum(t => ConvertHelper.To<decimal>(t.OrderByDescending(o => o.ID).FirstOrDefault().ItemValue)); // .Sum(t => ConvertHelper.To<decimal>(t.OrderByDescending(o => o.ID).FirstOrDefault().ItemValue));
if (!method(total, second.RealGiveFee)) //if (!method(total, second.RealGiveFee))
throw new PerformanceException("总金额与考核后金额不一致!"); // throw new PerformanceException("总金额与考核后金额不一致!");
} }
second.UseTempId = temp.UseTempId; second.UseTempId = temp.UseTempId;
second.Status = 2; second.Status = 2;
......
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