Commit a3f37477 by lcx

审核录入,支出带出科室;二次绩效其他模板打印时,根据录入时的顺序打印,取消排序

parent fb5262fb
...@@ -573,6 +573,7 @@ private List<HandsonRowData> GetAccountExtra(per_allot allot, int sheetType, str ...@@ -573,6 +573,7 @@ private List<HandsonRowData> GetAccountExtra(per_allot allot, int sheetType, str
switch (sheetType) switch (sheetType)
{ {
case (int)SheetType.OtherIncome: case (int)SheetType.OtherIncome:
case (int)SheetType.Expend:
data = data.Where(t => string.IsNullOrEmpty(t.AccountingUnitSpecial))?.ToList(); data = data.Where(t => string.IsNullOrEmpty(t.AccountingUnitSpecial))?.ToList();
if (data != null && data.Any()) if (data != null && data.Any())
{ {
......
...@@ -2310,7 +2310,7 @@ public dynamic Print(int secondId) ...@@ -2310,7 +2310,7 @@ public dynamic Print(int secondId)
header.WorkloadTypes = dict; header.WorkloadTypes = dict;
} }
return new { header, body = result.OrderBy(t => t.JobNumber).ThenBy(t => t.PersonName).ToList() }; return new { header, body = result/*.OrderBy(t => t.JobNumber).ThenBy(t => t.PersonName).ToList()*/ };
} }
#endregion 打印 #endregion 打印
......
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