Merge branch '二次绩效历史人员' into 多分支合并

performance/Performance.Services/Details/SecondAllotDetails.cs

@@ -550,7 +550,7 @@ public List<ag_othersource> GetOtherTempDetails(int userId, int secondId, int is
                     result = employees.Select(t => new ag_othersource
                     {
                         SecondId = secondId,
-                        WorkNumber = t.JobNumber ?? t.PersonnelNumber,
+                        WorkNumber = t.JobNumber /*?? t.PersonnelNumber*/,
                         Name = t.DoctorName,
                         Department = t.Department,
                         WorkPost = t.JobTitle,

performance/Performance.Services/ExtractExcelService/ExtractService.cs

@@ -153,7 +153,7 @@ private void WriteDataToFile(IWorkbook workbook, int allotId, Dictionary<ExDataD
                 if (types.Contains(sheetType) && point != null && point.DataFirstCellNum.HasValue)
                     ExtractHelper.ClearSheetPartialData(sheet, point, sheetType);
 
-                var customer = factory.GetWriteData(sheetType);
+                var customer = factory.GetWriteData(sheetType, logger);
                 if (customer != null)
                 {
                     string sheetName = sheet.SheetName.NoBlank();
@@ -253,4 +253,4 @@ private List<ExtractTransDto> StandDataFormat(int hospitalId, List<ex_result> re
             return groupdata.ToList();
         }
     }
-}
+}
\ No newline at end of file

performance/Performance.Services/ExtractExcelService/SheetDataWrite/DepartmentDataWrite.cs

-using NPOI.SS.UserModel;
+using Microsoft.Extensions.Logging;
+using NPOI.SS.UserModel;
 using Performance.DtoModels;
 using Performance.EntityModels;
 using System;
@@ -10,6 +11,13 @@ namespace Performance.Services.ExtractExcelService.SheetDataWrite
 {
     public class DepartmentDataWrite : ISheetDataWrite
     {
+        private readonly ILogger logger;
+
+        public DepartmentDataWrite(ILogger logger)
+        {
+            this.logger = logger;
+        }
+
         public void WriteCollectData(ISheet sheet, PerSheetPoint point, SheetType sheetType, ExcelStyle style, List<collect_data> collects)
         {
             if (collects == null || !collects.Any(t => !string.IsNullOrEmpty(t.TypeName))) return;
@@ -39,7 +47,6 @@ public void WriteCollectData(ISheet sheet, PerSheetPoint point, SheetType sheetT
 
         public void WriteSheetData(ISheet sheet, PerSheetPoint point, SheetType sheetType, ExcelStyle style, object data, Dictionary<ExDataDict, object> exdict = null)
         {
-
         }
     }
 }

performance/Performance.Services/ExtractExcelService/SheetDataWrite/IncomeDataWrite.cs

-using NPOI.SS.UserModel;
+using Microsoft.Extensions.Logging;
+using NPOI.SS.UserModel;
 using Performance.DtoModels;
 using Performance.EntityModels;
 using System;
@@ -10,6 +11,13 @@ namespace Performance.Services.ExtractExcelService.SheetDataWrite
 {
     public class IncomeDataWrite : ISheetDataWrite
     {
+        private readonly ILogger logger;
+
+        public IncomeDataWrite(ILogger logger)
+        {
+            this.logger = logger;
+        }
+
         public void WriteCollectData(ISheet sheet, PerSheetPoint point, SheetType sheetType, ExcelStyle style, List<collect_data> collects)
         {
             if (collects == null || !collects.Any(t => !string.IsNullOrEmpty(t.TypeName))) return;
@@ -50,4 +58,4 @@ public void WriteSheetData(ISheet sheet, PerSheetPoint point, SheetType sheetTyp
             }
         }
     }
-}
+}
\ No newline at end of file

performance/Performance.Services/ExtractExcelService/SheetDataWrite/OtherIncomeDataWrite.cs

-using NPOI.SS.UserModel;
+using Microsoft.Extensions.Logging;
+using NPOI.SS.UserModel;
 using Performance.DtoModels;
 using Performance.EntityModels;
 using System;
@@ -10,6 +11,13 @@ namespace Performance.Services.ExtractExcelService.SheetDataWrite
 {
     public class OtherIncomeDataWrite : ISheetDataWrite
     {
+        private readonly ILogger logger;
+
+        public OtherIncomeDataWrite(ILogger logger)
+        {
+            this.logger = logger;
+        }
+
         public void WriteCollectData(ISheet sheet, PerSheetPoint point, SheetType sheetType, ExcelStyle style, List<collect_data> collects)
         {
             if (collects == null || !collects.Any(t => !string.IsNullOrEmpty(t.TypeName))) return;

performance/Performance.Services/ExtractExcelService/SheetDataWrite/SpecialUnitDataWrite.cs

-using NPOI.SS.UserModel;
+using Microsoft.Extensions.Logging;
+using NPOI.SS.UserModel;
 using NPOI.SS.Util;
 using Performance.DtoModels;
 using Performance.EntityModels;
@@ -12,6 +13,13 @@ namespace Performance.Services.ExtractExcelService.SheetDataWrite
 {
     public class SpecialUnitDataWrite : ISheetDataWrite
     {
+        private readonly ILogger logger;
+
+        public SpecialUnitDataWrite(ILogger logger)
+        {
+            this.logger = logger;
+        }
+
         public void WriteCollectData(ISheet sheet, PerSheetPoint point, SheetType sheetType, ExcelStyle style, List<collect_data> collects)
         {
         }

performance/Performance.Services/ExtractExcelService/SheetDataWrite/WorkloadDataWrite.cs

-using NPOI.SS.UserModel;
+using Microsoft.Extensions.Logging;
+using NPOI.SS.UserModel;
 using Performance.DtoModels;
 using Performance.EntityModels;
 using System;
@@ -10,6 +11,13 @@ namespace Performance.Services.ExtractExcelService.SheetDataWrite
 {
     public class WorkloadDataWrite : ISheetDataWrite
     {
+        private readonly ILogger logger;
+
+        public WorkloadDataWrite(ILogger logger)
+        {
+            this.logger = logger;
+        }
+
         public void WriteCollectData(ISheet sheet, PerSheetPoint point, SheetType sheetType, ExcelStyle style, List<collect_data> collects)
         {
             if (collects == null || !collects.Any(t => !string.IsNullOrEmpty(t.TypeName))) return;

performance/Performance.Services/ExtractExcelService/WriteDataFactory.cs

-using Performance.DtoModels;
+using Microsoft.Extensions.Logging;
+using Performance.DtoModels;
 using Performance.Services.ExtractExcelService.SheetDataWrite;
 using System;
 using System.Collections.Generic;
@@ -8,7 +9,7 @@ namespace Performance.Services.ExtractExcelService
 {
     public class WriteDataFactory
     {
-        public ISheetDataWrite GetWriteData(SheetType sheetType)
+        public ISheetDataWrite GetWriteData(SheetType sheetType, ILogger logger)
         {
             ISheetDataWrite factory;
             switch (sheetType)
@@ -21,27 +22,31 @@ public ISheetDataWrite GetWriteData(SheetType sheetType)
                 //    break;
                 case SheetType.OtherIncome:
                 case SheetType.Expend:
-                    factory = new OtherIncomeDataWrite();
+                    factory = new OtherIncomeDataWrite(logger);
                     break;
+
                 case SheetType.Income:
-                    factory = new IncomeDataWrite();
+                    factory = new IncomeDataWrite(logger);
                     break;
+
                 case SheetType.Workload:
-                    factory = new WorkloadDataWrite();
+                    factory = new WorkloadDataWrite(logger);
                     break;
                 //case SheetType.AccountBasic:
                 //    factory = new AccountBasicDataWrite();
                 //    break;
                 case SheetType.SpecialUnit:
-                    factory = new SpecialUnitDataWrite();
+                    factory = new SpecialUnitDataWrite(logger);
                     break;
+
                 case SheetType.AccountExtra:
                 case SheetType.PersonExtra:
                 case SheetType.AccountScoreAverage:
                 case SheetType.BudgetRatio:
                 case SheetType.AssessBeforeOtherFee:
-                    factory = new DepartmentDataWrite();
+                    factory = new DepartmentDataWrite(logger);
                     break;
+
                 default:
                     return null;
             }