From 99389df14d105ea40829d629e100b5d5548f84c9 Mon Sep 17 00:00:00 2001 From: "LAPTOP-KB8JC2K2\\acer" Date: Mon, 19 Jul 2021 14:19:10 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82?= =?UTF-8?q?=E0=B8=9B=E0=B8=B1=E0=B8=8D=E0=B8=AB=E0=B8=B2=20=E0=B8=88?= =?UTF-8?q?=E0=B8=AD=E0=B8=A2=E0=B8=82=E0=B9=89=E0=B8=AD=E0=B8=A1=E0=B8=B9?= =?UTF-8?q?=E0=B8=A5=E0=B9=84=E0=B8=A1=E0=B9=88=E0=B9=80=E0=B8=88=E0=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eva_adjust_postponement_quotaService.cs | 27 ++++++++----------- 1 file changed, 11 insertions(+), 16 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 86e7121..148f28e 100644 --- a/Models/eva_adjust_postponement_quota/eva_adjust_postponement_quotaService.cs +++ b/Models/eva_adjust_postponement_quota/eva_adjust_postponement_quotaService.cs @@ -519,11 +519,11 @@ namespace TodoAPI2.Models model.decimal_limit_quota = Convert.ToDecimal(model.limit_quota); var postponement_data = (from postponement in _repository.Context.eva_adjust_postponement - join create_evaluation in _repository.Context.eva_create_evaluation on postponement.create_evaluation_id equals create_evaluation.id + //join create_evaluation in _repository.Context.eva_create_evaluation on postponement.create_evaluation_id equals create_evaluation.id where postponement.id == model.quota_id select new { - create_evaluation.performance_plan_id, + //create_evaluation.performance_plan_id, postponement.fiscal_year, postponement.theDate, postponement.limit_frame, @@ -532,34 +532,29 @@ namespace TodoAPI2.Models if(postponement_data != null) { - var plan_id = postponement_data.performance_plan_id; - - if(plan_id == null) - { - plan_id = (from plan_in_db in _repository.Context.eva_performance_plan + var 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(); - } - 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(); + + if(plan != null) { - var plan = (from eva_p_p in _repository.Context.eva_performance_plan - where eva_p_p.id == plan_id - select eva_p_p).FirstOrDefault(); - var start_plan = (from s in _repository.Context.eva_performance_plan_detail - where s.performance_plan_id == postponement_data.performance_plan_id + where s.performance_plan_id == 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 + where s.performance_plan_id == 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;