thamming_dev01/hrm_eva
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ปรับปรุง การอนุมัติแบบข้อตกลง ของ ผอ

Browse Source
This commit is contained in:
nakorn
2022-03-17 16:12:32 +07:00
parent f6afc23b45
commit 61f067f150
10 changed files with 70 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ApiControllers/rep_eva_xControllers.cs
View File

@@ -280,6 +280,10 @@ namespace TodoAPI2.Controllers
if (p1.chief_fullname == p1.supervisor2_fullname)
{
url = $"{mainurl}{reportsite}/rep_eva_x{k}A.{model.filetype}?{MyHelper.GetParameterForJasperReport(p1)}&j_username={username}&j_password={password}";
if (!string.IsNullOrEmpty(p1.supervisor3A_fullname))
{
url = $"{mainurl}{reportsite}/rep_eva_x{k}AC.{model.filetype}?{MyHelper.GetParameterForJasperReport(p1)}&j_username={username}&j_password={password}";
}
}
else
{
@@ -401,8 +405,8 @@ namespace TodoAPI2.Controllers
where n.performance_plan_id == x2.id
select n.start_date).Min();
var end = (from n in context.eva_performance_plan_detail
where n.performance_plan_id == x2.id
select n.end_date).Min();
where n.performance_plan_id == x2.id
select n.end_date).Max();
var text = MyHelper.GetDateStringForReport(start) + " ถึง " + MyHelper.GetDateStringForReport(end);
if(x2.theTime == 1)
{
@@ -414,6 +418,11 @@ namespace TodoAPI2.Controllers
}
}
if (string.IsNullOrEmpty(i.round2_text))
{
i.round2_text = $"1 เมษายน {p.fiscal_year} ถึง 30 กันยายน {p.fiscal_year}";
}
var detail = (from x in context.eva_create_evaluation_detail
where x.id == detail_id
select x).FirstOrDefault();