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

ปรับปรุงตามได้รับแจ้ง

Browse Source
This commit is contained in:
LAPTOP-KB8JC2K2\acer
2021-09-14 18:25:36 +07:00
parent e201075167
commit 3016221910
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ApiControllers/rep_eva_xControllers.cs
View File

@@ -275,6 +275,11 @@ namespace TodoAPI2.Controllers
{
string url = $"{mainurl}{reportsite}/rep_eva_x{k}.{model.filetype}?{MyHelper.GetParameterForJasperReport(p1)}&j_username={username}&j_password={password}";
if(p1.chief_fullname == p1.supervisor2_fullname && k == 3)
{
url = $"{mainurl}{reportsite}/rep_eva_x{k}A.{model.filetype}?{MyHelper.GetParameterForJasperReport(p1)}&j_username={username}&j_password={password}";
}
var data = httpclient.DownloadData(url);
PdfReader reader = new PdfReader(data);

3
Models/eva_limit_frame_group/eva_limit_frame_groupService.cs
View File

@@ -134,8 +134,7 @@ namespace TodoAPI2.Models
total_salary = m_eva_limit_frame_group.total_salary,
total_salary_limit = m_eva_limit_frame_group.total_salary_limit,
total_salary_limit_rounded = m_eva_limit_frame_group.total_salary_limit_rounded,
remark = m_eva_limit_frame_group.remark+@"
"+ m_eva_limit_frame_group.remark2,
remark = !string.IsNullOrEmpty(m_eva_limit_frame_group.remark2) ? m_eva_limit_frame_group.remark2 : m_eva_limit_frame_group.remark,
remark2 = m_eva_limit_frame_group.remark2,
frame_plan_guid_eva_limit_frame_plan_executed_date = fk_eva_limit_frame_planResult1.executed_date,