Commit 618976e0 by 钟博

Merge branch 'feature/划拨' into release/v20210625二次绩效划拨合并

parents 33b39b4f cc2b2d1f
......@@ -129,7 +129,7 @@ public List<CostTransferResponse> GetAuditList(int allotId, int menuType, int ro
ApplicantDepartment = result.ApplicantDepartment,
AdoptedDepartment = result.AdoptedDepartment
}).ToList();
}).OrderBy(t=>t.Status).ThenBy(t=>t.AdminStatus).ToList();
response.Add(result);
}
......@@ -260,7 +260,7 @@ public bool Applicat(CostTransferRequest request)
var allotStatus = new[] { (int)AllotStates.GenerateSucceed, (int)AllotStates.Archive };
if (allotStatus.Contains(allot.States))
throw new PerformanceException("绩效已下发");
throw new PerformanceException("绩效已下发或归档");
var transfer = new cost_transfer
{
......
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