删除ag_fixaitem中的worktype

performance/Performance.Api/wwwroot/Performance.EntityModels.xml

@@ -823,11 +823,6 @@
             1 value相加值为1
             </summary>
         </member>
-        <member name="P:Performance.EntityModels.ag_fixatitem.WorkType">
-            <summary>
-            
-            </summary>
-        </member>
         <member name="T:Performance.EntityModels.ag_header">
             <summary>
             二次分配不固定列头数据

performance/Performance.DtoModels/AutoMapper/AutoMapperConfigs.cs

@@ -185,8 +185,7 @@ public AutoMapperConfigs()
             CreateMap<ag_tempitem, HeadItem>();
             CreateMap<ag_workload, HeadItem>()
                 .ForMember(dest => dest.FiledId, opt => opt.MapFrom(src => src.ItemId))
-                .ForMember(dest => dest.FiledName, opt => opt.MapFrom(src => src.ItemName))
-                .ForMember(dest => dest.WorkType, opt => opt.MapFrom(src => src.WorkTypeId));
+                .ForMember(dest => dest.FiledName, opt => opt.MapFrom(src => src.ItemName));
             CreateMap<ag_fixatitem, BodyItem>()
                 .ForMember(dest => dest.FiledName, opt => opt.MapFrom(src => src.ItemName))
                 .ForMember(dest => dest.Value, opt => opt.MapFrom(src => src.ItemValue));

performance/Performance.DtoModels/Response/SecondResponse.cs

@@ -52,7 +52,6 @@ public BodyItem(HeadItem headItem)
             SourceType = headItem.SourceType;
             IsBring = headItem.IsBring;
             SpecialAttr = headItem.SpecialAttr;
-            WorkType = headItem.WorkType;
         }
     }
 }

performance/Performance.EntityModels/Entity/ag_fixatitem.cs

@@ -75,10 +75,5 @@ public class ag_fixatitem
         /// 1 value相加值为1
         /// </summary>
         public Nullable<int> SpecialAttr { get; set; }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public Nullable<int> WorkType { get; set; }
     }
 }

performance/Performance.Services/SecondAllot/SecondAllotDetails.cs

@@ -111,7 +111,7 @@ public SecondResponse GetSecondDetails(int userId, int secondId, int hospitalId,
 
             SupplyHeaderByWorkItem(hospitalId, result, secondAllot, savedDataList);
 
-            result.HeadItems = result.HeadItems.OrderBy(t => t.Type).ThenBy(t => t.WorkType).ThenBy(t => t.Sort).ThenBy(t => t.FiledName).ToList();
+            result.HeadItems = result.HeadItems.OrderBy(t => t.Type).ThenBy(t => t.Sort).ThenBy(t => t.FiledName).ToList();
             result.BodyItems = result.BodyItems.OrderBy(t => t.RowNumber).ToList();
 
             return result;
@@ -257,7 +257,7 @@ public List<BodyItem> GetEmployeeFromSavedData(int userId, ag_secondallot second
                     foreach (var column in otherShowColumns)
                     {
                         var tableFixedData = new BodyItem(column);
-                        var savedData = savedDataList.FirstOrDefault(w => w.RowNumber == rowNumber && w.Type == column.Type && w.ItemName == column.FiledName && w.WorkType == column.WorkType);
+                        var savedData = savedDataList.FirstOrDefault(w => w.RowNumber == rowNumber && w.Type == column.Type && w.ItemName == column.FiledName);
                         if (savedData != null)
                         {
                             tableFixedData.Value = savedData.ItemValue;
@@ -604,7 +604,6 @@ private void SupplyHeaderByWorkItem(int hospitalId, SecondResponse result, ag_se
                             headItem.FiledName += "金额";
                         headItem.FiledId += item.Id;
                         headItem.Sort = maxSortValue + sortindex;
-                        headItem.WorkType = item.Id;
                         headerItems.Add(headItem);
                         sortindex++;
                     }
@@ -612,19 +611,17 @@ private void SupplyHeaderByWorkItem(int hospitalId, SecondResponse result, ag_se
             }
             var defauleHeader = new List<ag_workload_type>
             {
-                new ag_workload_type { Id = 2, TypeName = "工作量绩效占比", },
-                new ag_workload_type { Id = 2, TypeName = "工作量分配绩效金额" },
+                new ag_workload_type { Id = (int) AgWorkloadType.Workload, TypeName = "工作量绩效占比", },
+                new ag_workload_type { Id = (int) AgWorkloadType.Workload, TypeName = "工作量分配绩效金额" },
             };
             foreach (var item in defauleHeader)
             {
                 result.HeadItems.Where(t => t.FiledName == item.TypeName).ToList()?.ForEach(t =>
                 {
-                    t.WorkType = item.Id;
                     t.SpecialAttr = item.TypeName.IndexOf("占比") > -1 ? 1 : 2;
                 });
                 result.BodyItems.Where(t => t.FiledName == item.TypeName).ToList()?.ForEach(t =>
                 {
-                    t.WorkType = item.Id;
                     t.SpecialAttr = item.TypeName.IndexOf("占比") > -1 ? 1 : 2;
                 });
             }

performance/Performance.Services/SecondAllotService.cs

@@ -386,7 +386,7 @@ public SecondResponse GetSecondDetail(UseTempRequest request, int userId)
 
             return new SecondResponse
             {
-                HeadItems = result.HeadItems.OrderBy(t => t.Type).ThenBy(t => t.WorkType).ThenBy(t => t.Sort).ThenBy(t => t.FiledName).ToList(),
+                HeadItems = result.HeadItems.OrderBy(t => t.Type).ThenBy(t => t.Sort).ThenBy(t => t.FiledName).ToList(),
                 BodyItems = result.BodyItems.OrderBy(t => t.RowNumber).ThenBy(t => t.Type).ThenBy(t => t.Sort).ToList(),
             };
         }
@@ -664,7 +664,6 @@ private void SupplyHeaderByWorkItem(UseTempRequest request, SecondResponse resul
                             headItem.FiledName += "金额";
                         headItem.FiledId += item.Id;
                         headItem.Sort = maxSortValue + sortindex;
-                        headItem.WorkType = item.Id;
                         headerItems.Add(headItem);
                         sortindex++;
                     }
@@ -672,19 +671,17 @@ private void SupplyHeaderByWorkItem(UseTempRequest request, SecondResponse resul
             }
             var defauleHeader = new List<ag_workload_type>
             {
-                new ag_workload_type { Id = 2, TypeName = "工作量绩效占比", },
-                new ag_workload_type { Id = 2, TypeName = "工作量分配绩效金额" },
+                new ag_workload_type { Id = (int)AgWorkloadType.Workload, TypeName = "工作量绩效占比", },
+                new ag_workload_type { Id = (int)AgWorkloadType.Workload, TypeName = "工作量分配绩效金额" },
             };
             foreach (var item in defauleHeader)
             {
                 result.HeadItems.Where(t => t.FiledName == item.TypeName).ToList()?.ForEach(t =>
                 {
-                    t.WorkType = item.Id;
                     t.SpecialAttr = item.TypeName.IndexOf("占比") > -1 ? 1 : 2;
                 });
                 result.BodyItems.Where(t => t.FiledName == item.TypeName).ToList()?.ForEach(t =>
                 {
-                    t.WorkType = item.Id;
                     t.SpecialAttr = item.TypeName.IndexOf("占比") > -1 ? 1 : 2;
                 });
             }
@@ -914,7 +911,7 @@ public bool UseTemp(UseTempRequest request)
                     secondList?.ForEach(t => t.IsArchive = allotList.FirstOrDefault(a => a.ID == t.AllotId).States == 8 ? 1 : 0);
 
                     //获取未归档  未提交  驳回 的二次绩效
-                    var secondId = secondList.Where(s => s.IsArchive == 0)?.Select(s => s.Id);
+                    var secondId = secondList?.Where(s => s.IsArchive == 0).Select(s => s.Id);
                     if (secondId == null || secondId.Count() <= 0)
                         return result;