Commit b4255d09 by 钟博

移除审核时间列

parent b8cf073c
...@@ -313,8 +313,7 @@ public ApiResponse AllComputeByPM([FromBody] ComputerRequest request) ...@@ -313,8 +313,7 @@ public ApiResponse AllComputeByPM([FromBody] ComputerRequest request)
BankCard = t.FirstOrDefault(s=>s.JobNumber==t.Key.JobNumber)?.BankCard, BankCard = t.FirstOrDefault(s=>s.JobNumber==t.Key.JobNumber)?.BankCard,
JobCategory=t.FirstOrDefault(s=>s.JobNumber==t.Key.JobNumber)?.JobCategory, JobCategory=t.FirstOrDefault(s=>s.JobNumber==t.Key.JobNumber)?.JobCategory,
Duty=t.FirstOrDefault(s=>s.JobNumber==t.Key.JobNumber)?.Duty, Duty=t.FirstOrDefault(s=>s.JobNumber==t.Key.JobNumber)?.Duty,
TitlePosition=t.FirstOrDefault(s=>s.JobNumber==t.Key.JobNumber)?.TitlePosition, TitlePosition=t.FirstOrDefault(s=>s.JobNumber==t.Key.JobNumber)?.TitlePosition
AuditTime=t.FirstOrDefault(s=>s.AccountingUnit==t.Key.AccountingUnit)?.AuditTime
}).OrderBy(t => }).OrderBy(t =>
{ {
string value = t.JobNumber; string value = t.JobNumber;
......
...@@ -126,11 +126,5 @@ public ComputeResponse(string source, string accountingUnit, string employeeName ...@@ -126,11 +126,5 @@ public ComputeResponse(string source, string accountingUnit, string employeeName
/// </summary> /// </summary>
public string TitlePosition { get; set; } public string TitlePosition { get; set; }
/// <summary>
/// 审核时间
/// </summary>
public Nullable<DateTime> AuditTime { get; set; }
} }
} }
...@@ -866,7 +866,6 @@ public List<ComputeResponse> AllCompute(int allotId, int hospitalId, int isShowM ...@@ -866,7 +866,6 @@ public List<ComputeResponse> AllCompute(int allotId, int hospitalId, int isShowM
if (response != null) if (response != null)
{ {
var types = new string[] { UnitType.行政高层.ToString(), UnitType.行政中层.ToString(), UnitType.行政后勤.ToString(), "行政工勤" }; var types = new string[] { UnitType.行政高层.ToString(), UnitType.行政中层.ToString(), UnitType.行政后勤.ToString(), "行政工勤" };
var agSecond = _perforAgsecondallotRepository.GetEntities(t => t.AllotId == allotId);
foreach (var item in response) foreach (var item in response)
{ {
// 二次分配默认 调节系数100% // 二次分配默认 调节系数100%
...@@ -910,7 +909,6 @@ public List<ComputeResponse> AllCompute(int allotId, int hospitalId, int isShowM ...@@ -910,7 +909,6 @@ public List<ComputeResponse> AllCompute(int allotId, int hospitalId, int isShowM
item.AccountingUnit = employees?.FirstOrDefault(w => w.PersonnelNumber == item.JobNumber)?.AccountingUnit ?? ""; item.AccountingUnit = employees?.FirstOrDefault(w => w.PersonnelNumber == item.JobNumber)?.AccountingUnit ?? "";
item.UnitType = employees?.FirstOrDefault(w => w.PersonnelNumber == item.JobNumber)?.UnitType ?? ""; item.UnitType = employees?.FirstOrDefault(w => w.PersonnelNumber == item.JobNumber)?.UnitType ?? "";
} }
item.AuditTime =agSecond.FirstOrDefault(t=>t.Department == item.AccountingUnit)?.AuditTime;
} }
} }
response.RemoveAll(w => w.PerforSumFee == 0 && w.PerforManagementFee == 0 && w.ShouldGiveFee == 0 && w.OthePerfor == 0 && w.HideOtherPerfor == 0 && w.RealGiveFee == 0); response.RemoveAll(w => w.PerforSumFee == 0 && w.PerforManagementFee == 0 && w.ShouldGiveFee == 0 && w.OthePerfor == 0 && w.HideOtherPerfor == 0 && w.RealGiveFee == 0);
...@@ -1055,7 +1053,6 @@ public void AddAprAmount(List<ComputeResponse> computes, List<view_per_total_amo ...@@ -1055,7 +1053,6 @@ public void AddAprAmount(List<ComputeResponse> computes, List<view_per_total_amo
// 如果医院其他绩效 已经被使用,则不再多次带出,防止单个人多次出现造成金额叠加 // 如果医院其他绩效 已经被使用,则不再多次带出,防止单个人多次出现造成金额叠加
if (apramount1 != null) if (apramount1 != null)
{ {
item.First().AuditTime = apramount1.AuditTime;
item.First().OthePerfor = apramount1.Amount; item.First().OthePerfor = apramount1.Amount;
apramount1.Use = true; apramount1.Use = true;
} }
...@@ -1063,7 +1060,6 @@ public void AddAprAmount(List<ComputeResponse> computes, List<view_per_total_amo ...@@ -1063,7 +1060,6 @@ public void AddAprAmount(List<ComputeResponse> computes, List<view_per_total_amo
// 如果医院其他绩效 已经被使用,则不再多次带出,防止单个人多次出现造成金额叠加 // 如果医院其他绩效 已经被使用,则不再多次带出,防止单个人多次出现造成金额叠加
if (apramount2 != null) if (apramount2 != null)
{ {
item.First().AuditTime = apramount1.AuditTime;
item.First().HideOtherPerfor = apramount2.Amount; item.First().HideOtherPerfor = apramount2.Amount;
apramount2.Use = true; apramount2.Use = true;
} }
......
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