行政工勤统一处理时额外多处理了错误代码回滚

performance/Performance.Services/ComputeService.cs

@@ -709,6 +709,12 @@ public List<DeptResponse> GetAdminPerformance(int allotId)
             #endregion
 
             var enumItems = UnitTypeUtil.GetUnitTypeFromEnum();
+            enumItems.ForEach(t =>
+            {
+                t.Value = UnitTypeUtil.Is(t.Name, UnitType.护理组.ToString()) ? t.Value + 2 : t.Value;
+                t.Name = t.Name == "行政后勤" ? UnitType.行政工勤.ToString() : t.Name;
+            });
+
             result = result.OrderBy(t => enumItems.FirstOrDefault(e => e.Name == t.UnitName)?.Value).ThenBy(t => t.AccountingUnit).ToList();
             return result;
         }

performance/Performance.Services/PerExcelService/SheetDataCompute/PerSheetDataComputeEconomic.cs

@@ -52,7 +52,7 @@ public PerSheet MergeCompute(PerExcel excel, List<EntityModels.cof_income> incom
                         //判断是否创建头部
                         if (!isHasData && dataList != null && dataList.Count() > 0)
                             isHasData = true;
-                        foreach (var item in UnitTypeUtil.GetUnitTypeFromEnum().Where(t => t.Value <= 3))
+                        foreach (var item in EnumHelper.GetItems<UnitType>().Where(t => t.Value <= 3))
                         {
                             var group = dataList.Where(t => t.UnitType == item.Name);
 
@@ -144,7 +144,7 @@ public PerSheet OnceCompute(PerSheet sheet)
                 {
                     header.PointCell = header.PointCell + phead;
                     header.Children.ForEach(item => item.PointCell = item.PointCell + phead);
-                     phead = phead + 3;
+                    phead = phead + 3;
                 }
             }
 

performance/Performance.Services/UnitTypeUtil.cs

@@ -99,12 +99,15 @@ public static EnumItem GetUnitTypeFromEnum(string unitType)
             unitType = unitType.Replace("行政后勤", "行政工勤");
             return EnumHelper.GetItems<UnitType>().FirstOrDefault(t => t.Name == unitType);
         }
-        public static List<EnumItem> GetUnitTypeFromEnum( )
-        { 
-            var enumItems = EnumHelper.GetItems<UnitType>() ;
+        /// <summary>
+        /// 行政工勤名称替换标准
+        /// </summary>
+        /// <returns></returns>
+        public static List<EnumItem> GetUnitTypeFromEnum()
+        {
+            var enumItems = EnumHelper.GetItems<UnitType>();
             enumItems.ForEach(t =>
             {
-                t.Value = Is(t.Name, UnitType.护理组.ToString()) ? t.Value + 2 : t.Value;
                 t.Name = t.Name == "行政后勤" ? UnitType.行政工勤.ToString() : t.Name;
             });
             return enumItems;