dbug

parent be833ad9
......@@ -120,7 +120,9 @@ public EmployeeRequestValidator()
RuleSet("Insert", () =>
{
action();
RuleFor(x => x.AllotID).NotNull().NotEmpty();
RuleFor(x => x.AccountingUnit).NotNull().NotEmpty();
RuleFor(x => x.DoctorName).NotNull().NotEmpty();
});
RuleSet("Update", () =>
......
......@@ -16,9 +16,15 @@ namespace Performance.Services
public class EmployeeService : IAutoInjection
{
private PerforImemployeeRepository perforImemployeeRepository;
public EmployeeService(PerforImemployeeRepository perforImemployeeRepository)
private PerforPersheetRepository perforPersheetRepository;
private PerforPerallotRepository perforPerallotRepository;
public EmployeeService(PerforImemployeeRepository perforImemployeeRepository,
PerforPersheetRepository perforPersheetRepository,
PerforPerallotRepository perforPerallotRepository)
{
this.perforImemployeeRepository = perforImemployeeRepository;
this.perforPersheetRepository = perforPersheetRepository;
this.perforPerallotRepository = perforPerallotRepository;
}
/// <summary>
......@@ -52,9 +58,20 @@ public List<im_employee> GetEmployeeList(int allotId)
/// <returns></returns>
public im_employee Insert(EmployeeRequest request)
{
var allot = perforPerallotRepository.GetEntity(t => t.ID == request.AllotID);
if (allot == null)
throw new PerformanceException("绩效方案不存在");
var sheet = perforPersheetRepository.GetEntity(t => t.AllotID == request.AllotID && t.SheetType == (int)SheetType.Employee);
if (sheet == null)
{
sheet = new per_sheet { AllotID = allot.ID, SheetName = "医院人员名单", SheetType = (int)SheetType.Employee, Source = 1 };
perforPersheetRepository.Add(sheet);
}
var employee = Mapper.Map<im_employee>(request);
if (string.IsNullOrEmpty(request.WorkTime))
employee.WorkTime = null;
employee.WorkTime = ConvertHelper.To<DateTime?>(request.WorkTime);
employee.SheetID = sheet.ID;
perforImemployeeRepository.Add(employee);
return employee;
}
......@@ -66,7 +83,6 @@ public im_employee Insert(EmployeeRequest request)
/// <returns></returns>
public im_employee Update(EmployeeRequest request)
{
Nullable<DateTime> time = null;
var employee = perforImemployeeRepository.GetEntity(t => t.ID == request.ID);
if (employee == null)
throw new PerformanceException("该人员不存在");
......@@ -78,7 +94,7 @@ public im_employee Update(EmployeeRequest request)
employee.FitPeople = request.FitPeople;
employee.JobTitle = request.JobTitle;
employee.PostCoefficient = request.PostCoefficient;
employee.WorkTime = string.IsNullOrEmpty(request.WorkTime) ? time : Convert.ToDateTime(request.WorkTime);
employee.WorkTime = ConvertHelper.To<DateTime?>(request.WorkTime);
employee.ScoreAverageRate = request.ScoreAverageRate;
employee.Attendance = request.Attendance;
employee.PeopleNumber = request.PeopleNumber;
......
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