From 18303d092f99d92e5dc42dfeb4a66354758d5547 Mon Sep 17 00:00:00 2001 From: "LAPTOP-KB8JC2K2\\acer" Date: Fri, 16 Jul 2021 11:50:25 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B8=9B?= =?UTF-8?q?=E0=B8=A3=E0=B8=B8=E0=B8=87=20=E0=B8=84=E0=B8=B4=E0=B8=A7?= =?UTF-8?q?=E0=B8=A3=E0=B8=B5=E0=B9=88=20=E0=B9=80=E0=B8=9E=E0=B8=B7?= =?UTF-8?q?=E0=B9=88=E0=B8=AD=E0=B9=83=E0=B8=AB=E0=B9=89=E0=B9=80=E0=B8=88?= =?UTF-8?q?=E0=B8=AD=20plan?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eva_adjust_postponement_quotaService.cs | 36 ++++++++++++------- 1 file changed, 24 insertions(+), 12 deletions(-) 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;