diff --git a/Models/eva_adjust_postponement_quota/eva_adjust_postponement_quotaService.cs b/Models/eva_adjust_postponement_quota/eva_adjust_postponement_quotaService.cs index 941696f..05406bb 100644 --- a/Models/eva_adjust_postponement_quota/eva_adjust_postponement_quotaService.cs +++ b/Models/eva_adjust_postponement_quota/eva_adjust_postponement_quotaService.cs @@ -531,22 +531,34 @@ namespace TodoAPI2.Models if(postponement_data != null) { - var plan = (from eva_p_p in _repository.Context.eva_performance_plan - where eva_p_p.id == postponement_data.performance_plan_id - select eva_p_p).FirstOrDefault(); + var plan_id = postponement_data.performance_plan_id; - var start_plan = (from s in _repository.Context.eva_performance_plan_detail - where s.performance_plan_id == postponement_data.performance_plan_id - select s.start_date).Min(); + if(plan_id == null) + { + plan_id = (from plan_in_db in _repository.Context.eva_performance_plan + where plan_in_db.fiscal_year == postponement_data.fiscal_year + && plan_in_db.theTime == plan_in_db.theTime + select plan_in_db.id).FirstOrDefault(); + } - var end_plan = (from s in _repository.Context.eva_performance_plan_detail - where s.performance_plan_id == postponement_data.performance_plan_id - select s.end_date).Max(); + if (plan_id.HasValue) + { + var plan = (from eva_p_p in _repository.Context.eva_performance_plan + where eva_p_p.id == plan_id + select eva_p_p).FirstOrDefault(); - model.theTime = plan.theTime; - model.min_plan_start_date = MyHelper.GetDateStringForReport(start_plan); - model.max_plan_end_date = MyHelper.GetDateStringForReport(end_plan); + var start_plan = (from s in _repository.Context.eva_performance_plan_detail + where s.performance_plan_id == postponement_data.performance_plan_id + select s.start_date).Min(); + var end_plan = (from s in _repository.Context.eva_performance_plan_detail + where s.performance_plan_id == postponement_data.performance_plan_id + select s.end_date).Max(); + + model.theTime = plan.theTime; + model.min_plan_start_date = MyHelper.GetDateStringForReport(start_plan); + model.max_plan_end_date = MyHelper.GetDateStringForReport(end_plan); + } } return model;