Skip to content

P
performance
Commit a3fb8981 by lcx
Options

二次绩效工作量类型枚举修改

parent 99bf0116
Showing with 41 additions and 27 deletions
performance/Performance.Api/wwwroot/Performance.DtoModels.xml
......@@ -143,19 +143,14 @@
<member name="F:Performance.DtoModels.AllotStates.GenerateAccomplish">
<summary> 绩效结果解析成功 </summary>
</member>
<member name="F:Performance.DtoModels.AgWorkloadType.Workload">
<summary>
工作量
</summary>
</member>
<member name="F:Performance.DtoModels.AgWorkloadType.Other">
<member name="F:Performance.DtoModels.AgWorkloadType.SingleAwards">
<summary>
其他
单项奖励
</summary>
</member>
<member name="F:Performance.DtoModels.AgWorkloadType.SingleAwards">
<member name="F:Performance.DtoModels.AgWorkloadType.Workload">
<summary>
单项奖励
工作量
</summary>
</member>
<member name="P:Performance.DtoModels.PerAgainData.RowNumber">
......
performance/Performance.Api/wwwroot/Performance.EntityModels.xml
......@@ -43,6 +43,9 @@
<member name="P:Performance.EntityModels.PerformanceDbContext.ag_workload">
<summary> 二次绩效工作量绩效 </summary>
</member>
<member name="P:Performance.EntityModels.PerformanceDbContext.ag_workload_type">
<summary> </summary>
</member>
<member name="P:Performance.EntityModels.PerformanceDbContext.as_assess">
<summary> 考核类别 </summary>
</member>
......@@ -917,9 +920,29 @@
</summary>
</member>
<member name="P:Performance.EntityModels.ag_workload.Type">
<member name="P:Performance.EntityModels.ag_workload.WorkTypeId">
<summary>
1、单项奖励 2、工作量占比 ..（自定义占比）
</summary>
</member>
<member name="T:Performance.EntityModels.ag_workload_type">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.ag_workload_type.Id">
<summary>
1、工作量 2、其他
</summary>
</member>
<member name="P:Performance.EntityModels.ag_workload_type.HospitalId">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.ag_workload_type.TypeName">
<summary>
</summary>
</member>
<member name="T:Performance.EntityModels.as_assess">
......@@ -2869,7 +2892,7 @@
</member>
<member name="P:Performance.EntityModels.per_budget_result.States">
<summary>
1.初始 2.确认使用发放/调节系数 3.取消使用
1.初始 2. 确认使用发放/调节系数
</summary>
</member>
<member name="P:Performance.EntityModels.per_budget_result.CreateDate">
......
performance/Performance.DtoModels/Enum.cs
......@@ -85,16 +85,12 @@ public enum AllotStates
public enum AgWorkloadType
{
/// <summary>
/// 工作量
/// 单项奖励
/// </summary>
Workload = 1,
SingleAwards = 1,
/// <summary>
/// 其他
/// </summary>
Other = 2,
/// <summary>
/// 单项奖励
/// 工作量
/// </summary>
SingleAwards = 3,
Workload = 2,
}
}
performance/Performance.Services/SecondAllotService.cs
......@@ -429,7 +429,7 @@ private void FillData(ag_secondallot second, List<BodyItem> bodyItems)
private void SupplyHeaderByWorkItem(UseTempRequest request, SecondResponse result)
{
var workitem = perforAgworkloadRepository.GetEntities(t => t.HospitalId == request.HospitalId && t.Department == request.Department
&& t.UnitType == request.UnitType && t.Type != 1);
&& t.UnitType == request.UnitType && !EnumHelper.GetItems<AgWorkloadType>().Select(type => type.Value).Contains(t.WorkTypeId));
if (workitem == null || !workitem.Any(t => t.Id > 0))
return;
......@@ -746,7 +746,7 @@ public void RefreshTemp(UseTempRequest request)
public List<ag_workload> GetWorkloadList(WorkloadRequest request)
{
return perforAgworkloadRepository.GetEntities(t => t.HospitalId == request.HospitalId && t.Department == request.Department
&& t.UnitType == request.UnitType);
&& t.UnitType == request.UnitType && t.WorkTypeId == (int)AgWorkloadType.SingleAwards);
}
/// <summary>
......@@ -767,7 +767,7 @@ public bool WorkloadAdd(WorkloadRequest request)
FactorValue = request.FactorValue ?? 1,
ItemName = request.ItemName,
Sort = request.Sort ?? 1,
Type = request.Type,
WorkTypeId = request.Type,
};
var result = perforAgworkloadRepository.Add(workload);
if (result)
......@@ -798,7 +798,7 @@ public bool WorkloadUpdate(WorkloadRequest request)
workload.ItemName = request.ItemName;
workload.Sort = request.Sort;
workload.ItemId = $"Feild{workload.Id}";
workload.Type = request.Type;
workload.WorkTypeId = request.Type;
return perforAgworkloadRepository.Update(workload);
}
......@@ -822,7 +822,7 @@ public bool WorkloadDelete(int id)
public List<ag_workload> GetSingleList(WorkloadRequest request)
{
return perforAgworkloadRepository.GetEntities(t => t.HospitalId == request.HospitalId && t.Department == request.Department
&& t.UnitType == request.UnitType && t.Type == (int)AgWorkloadType.SingleAwards);
&& t.UnitType == request.UnitType && t.WorkTypeId == (int)AgWorkloadType.SingleAwards);
}
#endregion
......@@ -1016,11 +1016,11 @@ public List<HeadItem> GetHeadItems(int tempId, int hospitalId, string department
var workItem = perforAgworkloadRepository.GetEntities(t => t.HospitalId == hospitalId && t.Department == department && t.UnitType == unitType);
if (workItem != null && workItem.Count > 0)
{
var workDtos = Mapper.Map<List<HeadItem>>(workItem.Where(t => t.Type != (int)AgWorkloadType.SingleAwards));
var workDtos = Mapper.Map<List<HeadItem>>(workItem.Where(t => t.WorkTypeId != (int)AgWorkloadType.SingleAwards));
workDtos.ForEach(t => { t.Type = 3; });
headItems.AddRange(workDtos);
workDtos = Mapper.Map<List<HeadItem>>(workItem.Where(t => t.Type == (int)AgWorkloadType.SingleAwards));
workDtos = Mapper.Map<List<HeadItem>>(workItem.Where(t => t.WorkTypeId == (int)AgWorkloadType.SingleAwards));
workDtos.ForEach(t => { t.Type = 4; });
headItems.AddRange(workDtos);
}
......
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