worktype系数转换

performance/Performance.DtoModels/AutoMapper/AutoMapperConfigs.cs

@@ -187,7 +187,8 @@ 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.FiledName, opt => opt.MapFrom(src => src.ItemName))
+                .ForMember(dest => dest.WorkType, opt => opt.MapFrom(src => src.WorkTypeId));
             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/Request/WorkloadRequest.cs

@@ -57,7 +57,6 @@ public WorkloadRequestValidator()
                 RuleFor(x => x.Department).NotNull().NotEmpty();
                 RuleFor(x => x.UnitType).NotNull().NotEmpty();
                 RuleFor(x => x.ItemName).NotNull().NotEmpty();
-                RuleFor(x => x.WorkTypeId).NotNull().GreaterThan(0);
             });
 
             RuleSet("Update", () =>
@@ -65,7 +64,6 @@ public WorkloadRequestValidator()
                 RuleFor(x => x.Id).NotNull().GreaterThan(0);
                 RuleFor(x => x.HospitalId).NotNull().GreaterThan(0);
                 RuleFor(x => x.ItemName).NotNull().NotEmpty();
-                RuleFor(x => x.WorkTypeId).NotNull().GreaterThan(0);
             });
 
             RuleSet("Delete", () =>

performance/Performance.Services/SecondAllotService.cs

@@ -312,7 +312,7 @@ public SecondResponse GetSecondDetail(UseTempRequest request)
 
             return new SecondResponse
             {
-                HeadItems = result.HeadItems.OrderBy(t => t.Type).ThenBy(t => t.Sort).ThenBy(t => t.FiledName).ToList(),
+                HeadItems = result.HeadItems.OrderBy(t => t.Type).ThenBy(t => t.WorkType).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(),
             };
         }
@@ -465,7 +465,8 @@ private void SupplyHeaderByWorkItem(UseTempRequest request, SecondResponse resul
                     FiledId = "ThePerformanceAmountOf",
                     Type =  1,
                     SourceType = 1,
-                    IsBring =  2
+                    IsBring =  2,
+                    SpecialAttr = 2,
                 }
             };