From 3016221910167c1e5d83110c28d266149776023e Mon Sep 17 00:00:00 2001 From: "LAPTOP-KB8JC2K2\\acer" Date: Tue, 14 Sep 2021 18:25:36 +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=E0=B8=95=E0=B8=B2=E0=B8=A1=E0=B9=84?= =?UTF-8?q?=E0=B8=94=E0=B9=89=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B9=81=E0=B8=88?= =?UTF-8?q?=E0=B9=89=E0=B8=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ApiControllers/rep_eva_xControllers.cs | 5 +++++ Models/eva_limit_frame_group/eva_limit_frame_groupService.cs | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ApiControllers/rep_eva_xControllers.cs b/ApiControllers/rep_eva_xControllers.cs index 6e68b77..c5f9599 100644 --- a/ApiControllers/rep_eva_xControllers.cs +++ b/ApiControllers/rep_eva_xControllers.cs @@ -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); diff --git a/Models/eva_limit_frame_group/eva_limit_frame_groupService.cs b/Models/eva_limit_frame_group/eva_limit_frame_groupService.cs index 108f11c..0ee13f4 100644 --- a/Models/eva_limit_frame_group/eva_limit_frame_groupService.cs +++ b/Models/eva_limit_frame_group/eva_limit_frame_groupService.cs @@ -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,