Commit 43f46099 by lcx

添加预留比例字段

parent 7a10fa1a
...@@ -80,5 +80,15 @@ public class ag_othersource ...@@ -80,5 +80,15 @@ public class ag_othersource
/// 实发绩效工资金额 /// 实发绩效工资金额
/// </summary> /// </summary>
public Nullable<decimal> RealAmount { get; set; } public Nullable<decimal> RealAmount { get; set; }
/// <summary>
/// 预留比例
/// </summary>
public Nullable<decimal> ReservedRatio { get; set; }
/// <summary>
/// 预留金额
/// </summary>
public Nullable<decimal> ReservedAmount { get; set; }
} }
} }
...@@ -352,6 +352,7 @@ private List<BodyItem> GetEmployees(int allotId, int userId, List<HeadItem> head ...@@ -352,6 +352,7 @@ private List<BodyItem> GetEmployees(int allotId, int userId, List<HeadItem> head
{ ("姓名", "FullName"), (t) => t.DoctorName }, { ("姓名", "FullName"), (t) => t.DoctorName },
{ ("岗位", "Post"), (t) => !string.IsNullOrEmpty(t.Duty) && (t.Duty.IndexOf("主任") > -1 || t.Duty.IndexOf("护士长") > -1) ? "主任" : "其他" }, { ("岗位", "Post"), (t) => !string.IsNullOrEmpty(t.Duty) && (t.Duty.IndexOf("主任") > -1 || t.Duty.IndexOf("护士长") > -1) ? "主任" : "其他" },
{ ("出勤", "ActualAttendance"), (t) => t.AttendanceDay }, { ("出勤", "ActualAttendance"), (t) => t.AttendanceDay },
{ ("预留比例", "ReservedRatio"), (t) => t.ReservedRatio },
}; };
int rowNumber = 1; int rowNumber = 1;
...@@ -1319,7 +1320,8 @@ public List<ag_othersource> OtherList(int secondId, int userId) ...@@ -1319,7 +1320,8 @@ public List<ag_othersource> OtherList(int secondId, int userId)
WorkNumber = t.PersonnelNumber, WorkNumber = t.PersonnelNumber,
Name = t.DoctorName, Name = t.DoctorName,
Department = t.Department, Department = t.Department,
WorkPost = t.JobTitle WorkPost = t.JobTitle,
ReservedRatio = t.ReservedRatio
}).ToList(); }).ToList();
} }
} }
......
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