补全绩效发放审核时间

performance/Performance.Api/Controllers/ComputeController.cs

@@ -313,7 +313,8 @@ public ApiResponse AllComputeByPM([FromBody] ComputerRequest request)
                 BankCard = t.FirstOrDefault(s=>s.JobNumber==t.Key.JobNumber)?.BankCard,
                 JobCategory=t.FirstOrDefault(s=>s.JobNumber==t.Key.JobNumber)?.JobCategory,
                 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 =>
             {
                 string value = t.JobNumber;

performance/Performance.EntityModels/Other/view_per_apr_amount.cs

-namespace Performance.EntityModels
+using System;
+
+namespace Performance.EntityModels
 {
     public class view_per_apr_amount : per_apr_amount
     {
@@ -44,5 +46,7 @@ public view_per_total_amount(string unitType, string accountingUnit, string pers
         /// 是否被使用 默认false
         /// </summary>
         public bool Use { get; set; }
+
+        public DateTime AuditTime { get; set; }
     }
 }

performance/Performance.Services/ComputeService.cs

@@ -1055,6 +1055,7 @@ public void AddAprAmount(List<ComputeResponse> computes, List<view_per_total_amo
                 // 如果医院其他绩效 已经被使用，则不再多次带出，防止单个人多次出现造成金额叠加
                 if (apramount1 != null)
                 {
+                    item.First().AuditTime = apramount1.AuditTime;
                     item.First().OthePerfor = apramount1.Amount;
                     apramount1.Use = true;
                 }
@@ -1062,6 +1063,7 @@ public void AddAprAmount(List<ComputeResponse> computes, List<view_per_total_amo
                 // 如果医院其他绩效 已经被使用，则不再多次带出，防止单个人多次出现造成金额叠加
                 if (apramount2 != null)
                 {
+                    item.First().AuditTime = apramount1.AuditTime;
                     item.First().HideOtherPerfor = apramount2.Amount;
                     apramount2.Use = true;
                 }

performance/Performance.Services/ConfigService.cs

@@ -1357,11 +1357,13 @@ public SheetExportResponse GetDrugtypeFactor(AllotDeptRequest request)
             {
                 new Cell{ CellType = "header", CellValue = "", PointCell = 0, MergeRow = 1, MergeCell = 1 },
                 new Cell{ CellType = "header", CellValue = "", PointCell = 1, MergeRow = 1, MergeCell = 1 },
+                new Cell{ CellType = "header", CellValue = "", PointCell = 2, MergeRow = 1, MergeCell = 1 },
             };
             var cells = new List<Cell>
             {
-                new Cell{ CellType = "header", CellValue = "项目小类(测算表)", PointCell = 0, MergeRow = 1, MergeCell = 1 },
-                new Cell{ CellType = "header", CellValue = "费用大类(大屏展示)", PointCell = 1, MergeRow = 1, MergeCell = 1 }
+                new Cell{ CellType = "header", CellValue = "序号", PointCell = 0, MergeRow = 1, MergeCell = 1 },
+                new Cell{ CellType = "header", CellValue = "项目小类(测算表)", PointCell = 1, MergeRow = 1, MergeCell = 1 },
+                new Cell{ CellType = "header", CellValue = "费用大类(大屏展示)", PointCell = 2, MergeRow = 1, MergeCell = 1 }
             };
 
             var defaultColumns = new Dictionary<string, string>
@@ -1374,7 +1376,7 @@ public SheetExportResponse GetDrugtypeFactor(AllotDeptRequest request)
             int index = 0;
             foreach (var model in models)
             {
-                mergeCells.Add(new Cell { CellType = "header", CellValue = model.ModuleName, PointCell = 2 + index * 3, MergeRow = 1, MergeCell = defaultColumns.Count });
+                mergeCells.Add(new Cell { CellType = "header", CellValue = model.ModuleName, PointCell = 3 + index * 3, MergeRow = 1, MergeCell = defaultColumns.Count });
 
                 int i = 0;
                 cells.AddRange(defaultColumns.Select(t =>
@@ -1419,6 +1421,7 @@ public SheetExportResponse GetDrugtypeFactor(AllotDeptRequest request)
                 {
                     var rowcells = new List<Cell>
                     {
+                        new Cell { CellType = "body", CellValue = index+1, PointCell = 0, MergeRow = 1, MergeCell = 1 },
                         new Cell { CellType = "body", CellValue = charge.Charge, PointCell = 0, MergeRow = 1, MergeCell = 1 },
                         new Cell { CellType = "body", CellValue = charge.ChargeType, PointCell = 1, MergeRow = 1, MergeCell = 1 },
                     };