Commit 3ce206f8 by lcx

其他绩效审核状态,及审核

parent d62de023
...@@ -287,8 +287,7 @@ public ApiResponse GetAprGroupList([FromBody] per_apr_amount request) ...@@ -287,8 +287,7 @@ public ApiResponse GetAprGroupList([FromBody] per_apr_amount request)
{ {
AccountingUnit = t.Key.AccountingUnit, AccountingUnit = t.Key.AccountingUnit,
TypeInDepartment = t.Key.TypeInDepartment, TypeInDepartment = t.Key.TypeInDepartment,
Amount = t.Sum(s => s.Amount ?? 0), Amount = t.Sum(s => s.Amount ?? 0)
Status = t.Any(s => s.Status == 2) ? 2 : t.Any(s => s.Status == 4) ? 4 : t.FirstOrDefault().Status
}); });
return new ApiResponse(ResponseType.OK, "ok", result); return new ApiResponse(ResponseType.OK, "ok", result);
} }
...@@ -313,6 +312,7 @@ public ApiResponse GetAprDetail([FromBody] per_apr_amount request) ...@@ -313,6 +312,7 @@ public ApiResponse GetAprDetail([FromBody] per_apr_amount request)
{ {
PersonnelNumber = t.Key.PersonnelNumber, PersonnelNumber = t.Key.PersonnelNumber,
DoctorName = t.Key.DoctorName, DoctorName = t.Key.DoctorName,
Status = t.Any(s => s.Status == 2) ? 2 : t.Any(s => s.Status == 4) ? 4 : t.FirstOrDefault().Status,
Detail = t.GroupBy(group => group.PerforType).Select(s => new TitleValue<decimal> Detail = t.GroupBy(group => group.PerforType).Select(s => new TitleValue<decimal>
{ {
Title = s.Key, Title = s.Key,
......
...@@ -10,6 +10,10 @@ public class AprAmountAuditRequest ...@@ -10,6 +10,10 @@ public class AprAmountAuditRequest
/// <summary> 二次绩效Id </summary> /// <summary> 二次绩效Id </summary>
public int[] Id { get; set; } public int[] Id { get; set; }
public string PersonnelNumber { get; set; }
public string DoctorName { get; set; }
/// <summary> 审核结果 1、审核通过 2、驳回 </summary> /// <summary> 审核结果 1、审核通过 2、驳回 </summary>
public int IsPass { get; set; } public int IsPass { get; set; }
......
...@@ -111,6 +111,7 @@ private void WriteDataToFile(IWorkbook workbook, int allotId, Dictionary<ExDataD ...@@ -111,6 +111,7 @@ private void WriteDataToFile(IWorkbook workbook, int allotId, Dictionary<ExDataD
var collectData = collectdataRepository.GetEntities(t => t.AllotID == allotId); var collectData = collectdataRepository.GetEntities(t => t.AllotID == allotId);
WriteDataFactory factory = new WriteDataFactory(); WriteDataFactory factory = new WriteDataFactory();
var types = new List<SheetType> { SheetType.OtherIncome, SheetType.Income, SheetType.Expend, SheetType.Workload };
for (int sheetIndex = 0; sheetIndex < workbook.NumberOfSheets; sheetIndex++) for (int sheetIndex = 0; sheetIndex < workbook.NumberOfSheets; sheetIndex++)
{ {
var sheet = workbook.GetSheetAt(sheetIndex); var sheet = workbook.GetSheetAt(sheetIndex);
...@@ -119,7 +120,7 @@ private void WriteDataToFile(IWorkbook workbook, int allotId, Dictionary<ExDataD ...@@ -119,7 +120,7 @@ private void WriteDataToFile(IWorkbook workbook, int allotId, Dictionary<ExDataD
if (sheetType == SheetType.Unidentifiable) continue; if (sheetType == SheetType.Unidentifiable) continue;
var point = PerSheetDataFactory.GetDataRead(sheetType)?.Point; var point = PerSheetDataFactory.GetDataRead(sheetType)?.Point;
if (point != null && point.DataFirstCellNum.HasValue) if (types.Contains(sheetType) && point != null && point.DataFirstCellNum.HasValue)
ExtractHelper.ClearSheetPartialData(sheet, point, sheetType); ExtractHelper.ClearSheetPartialData(sheet, point, sheetType);
var customer = factory.GetWriteData(sheetType); var customer = factory.GetWriteData(sheetType);
......
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