Commit ddaf6481 by 李承祥

获取录入数据是,补充type和sourcetype;刷新应用模板时,同时也对type和sourcetype进行补充

parent 0af79186
...@@ -186,8 +186,7 @@ public AutoMapperConfigs() ...@@ -186,8 +186,7 @@ public AutoMapperConfigs()
CreateMap<ag_tempitem, HeadItem>(); CreateMap<ag_tempitem, HeadItem>();
CreateMap<ag_workload, HeadItem>() CreateMap<ag_workload, HeadItem>()
.ForMember(dest => dest.FiledId, opt => opt.MapFrom(src => src.ItemId)) .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.Type, opt => opt.NullSubstitute(3));
CreateMap<ag_fixatitem, BodyItem>() CreateMap<ag_fixatitem, BodyItem>()
.ForMember(dest => dest.FiledName, opt => opt.MapFrom(src => src.ItemName)) .ForMember(dest => dest.FiledName, opt => opt.MapFrom(src => src.ItemName))
.ForMember(dest => dest.Value, opt => opt.MapFrom(src => src.ItemValue)); .ForMember(dest => dest.Value, opt => opt.MapFrom(src => src.ItemValue));
......
...@@ -199,6 +199,8 @@ public void RefreshTemp(UseTempRequest request) ...@@ -199,6 +199,8 @@ public void RefreshTemp(UseTempRequest request)
UnitType = fixatList.First().UnitType, UnitType = fixatList.First().UnitType,
Sort = tempItem?.FirstOrDefault(w => w.FiledName == s)?.Sort ?? workItem?.FirstOrDefault(w => w.ItemName == s)?.Sort, Sort = tempItem?.FirstOrDefault(w => w.FiledName == s)?.Sort ?? workItem?.FirstOrDefault(w => w.ItemName == s)?.Sort,
FactorValue = workItem?.FirstOrDefault(w => w.ItemName == s)?.FactorValue, FactorValue = workItem?.FirstOrDefault(w => w.ItemName == s)?.FactorValue,
Type = tempItem?.FirstOrDefault(w => w.FiledName == s)?.Type ?? 3,
SourceType = tempItem?.FirstOrDefault(w => w.FiledName == s)?.SourceType ?? 1,
})); }));
}); });
if (addItems != null && addItems.Count() > 0) if (addItems != null && addItems.Count() > 0)
...@@ -357,7 +359,11 @@ public SecondResponse GetSecondDetail(UseTempRequest request) ...@@ -357,7 +359,11 @@ public SecondResponse GetSecondDetail(UseTempRequest request)
//获取工作量列头 //获取工作量列头
var workItem = perforAgworkloadRepository.GetEntities(t => t.HospitalId == usetemp.HospitalId && t.Department == usetemp.Department && t.UnitType == usetemp.UnitType); var workItem = perforAgworkloadRepository.GetEntities(t => t.HospitalId == usetemp.HospitalId && t.Department == usetemp.Department && t.UnitType == usetemp.UnitType);
if (workItem != null && workItem.Count > 0) if (workItem != null && workItem.Count > 0)
headItems.AddRange(Mapper.Map<List<HeadItem>>(workItem)); {
var workDtos = Mapper.Map<List<HeadItem>>(workItem);
workDtos.ForEach(t => { t.Type = 3; });
headItems.AddRange(workDtos);
}
var result = new SecondResponse { HeadItems = headItems }; var result = new SecondResponse { HeadItems = headItems };
//获取数据 //获取数据
...@@ -379,6 +385,8 @@ public SecondResponse GetSecondDetail(UseTempRequest request) ...@@ -379,6 +385,8 @@ public SecondResponse GetSecondDetail(UseTempRequest request)
AllotId = fixatList.First().AllotId, AllotId = fixatList.First().AllotId,
SecondId = fixatList.First().SecondId, SecondId = fixatList.First().SecondId,
UnitType = fixatList.First().UnitType, UnitType = fixatList.First().UnitType,
Type = headItems?.FirstOrDefault(s => s.FiledName == t)?.Type,
SourceType = headItems?.FirstOrDefault(s => s.FiledName == t)?.SourceType,
Sort = headItems?.FirstOrDefault(s => s.FiledName == t)?.Sort, Sort = headItems?.FirstOrDefault(s => s.FiledName == t)?.Sort,
FactorValue = headItems?.FirstOrDefault(s => s.FiledName == t)?.FactorValue, FactorValue = headItems?.FirstOrDefault(s => s.FiledName == t)?.FactorValue,
})); }));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment