特殊核算单元新加固定列、收入获取费用类型添加null值判断

performance/Performance.Api/appsettings.Localhost.json

@@ -8,7 +8,7 @@
   },
   "AppConnection": {
     //"PerformanceConnectionString": "server=112.124.13.17;database=db_performance;uid=suvalue;pwd=suvalue2016;pooling=true;charset=utf8;convert zero datetime=true;port=3306;connection timeout=120;max pool size=512;allow user variables=true;",
-    "PerformanceConnectionString": "server=192.168.18.166;database=db_performance_screen;uid=root;pwd=1234qwer;pooling=true;charset=utf8;convert zero datetime=true;port=3306;connection timeout=120;max pool size=512;allow user variables=true;",
+    "PerformanceConnectionString": "server=192.168.18.166;database=db_test_yuyao;uid=root;pwd=1234qwer;pooling=true;charset=utf8;convert zero datetime=true;port=3306;connection timeout=120;max pool size=512;allow user variables=true;",
     "HangfireConnectionString": "server=192.168.18.166;database=db_hangfire;uid=root;pwd=1234qwer;port=3306;allow user variables=true;",
     "RedisConnectionString": "116.62.245.55:6379,defaultDatabase=2"
   },

performance/Performance.Services/ExtractExcelService/ExtractDtos/SpecialUnitColumns.cs

@@ -21,5 +21,19 @@ public class SpecialUnitColumns
         public const string AssessBefore = "考核前绩效";
 
         public const string Avg = "人均";
+
+        #region Extend
+
+        public const string AssessBeforeTotal = "考核前绩效合计";
+
+        public const string NewAvg = "新人均";
+
+        public const string OldPerformanceTotal = "旧绩效合计";
+
+        public const string OldAvg = "旧人均";
+
+        public const string AvgDifference = "人均差额";
+
+        #endregion
     }
 }

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

@@ -44,7 +44,7 @@ public void WriteSheetData(ISheet sheet, PerSheetPoint point, SheetType sheetTyp
 
             if (data is List<ExtractTransDto> extractDto && extractDto.Any())
             {
-                var headers = extractDto.Select(t => t.Category.Trim()).Distinct()
+                var headers = extractDto.Select(t => t.Category?.Trim() ?? "").Distinct()
                     .Select(t => new ExcelHeader
                     {
                         ColumnName = t,

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

@@ -329,8 +329,13 @@ private void AddMergedRegion(ISheet sheet, List<SpecialCellRange> ranges, List<s
                 SpecialUnitColumns.Department,
                 SpecialUnitColumns.PeopleNumber,
                 SpecialUnitColumns.AdjustFactor,
-                SpecialUnitColumns.AssessBefore,
-                SpecialUnitColumns.Avg
+                //SpecialUnitColumns.AssessBefore,
+                SpecialUnitColumns.Avg,
+                SpecialUnitColumns.AssessBeforeTotal,
+                SpecialUnitColumns.NewAvg,
+                SpecialUnitColumns.OldPerformanceTotal,
+                SpecialUnitColumns.OldAvg,
+                SpecialUnitColumns.AvgDifference
             }.Select(t => columns.IndexOf(t));
             if (columnIndexs == null || !columnIndexs.Any(t => t > -1)) return;