ปรับปรุง คิวรี่ เพื่อให้เจอ plan

This commit is contained in:
LAPTOP-KB8JC2K2\acer
2021-07-16 11:50:25 +07:00
parent 622fb46323
commit 18303d092f

View File

@@ -530,9 +530,21 @@ namespace TodoAPI2.Models
}).FirstOrDefault();
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
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 == postponement_data.performance_plan_id
where eva_p_p.id == plan_id
select eva_p_p).FirstOrDefault();
var start_plan = (from s in _repository.Context.eva_performance_plan_detail
@@ -546,7 +558,7 @@ namespace TodoAPI2.Models
model.theTime = plan.theTime;
model.min_plan_start_date = MyHelper.GetDateStringForReport(start_plan);
model.max_plan_end_date = MyHelper.GetDateStringForReport(end_plan);
}
}
return model;