From 9244531bb0b936908a360be985d9b49756b6818d Mon Sep 17 00:00:00 2001 From: Nakorn Rientrakrunchai Date: Sun, 23 Aug 2020 16:36:26 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82?= =?UTF-8?q?=20op=20324,3247,3248?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ApiControllers/rep_eva01Controllers.cs | 6 ++++ .../external_linkageService.cs | 28 +++++++++++++++---- Models/rep_eva01/Irep_eva01Service.cs | 2 +- Models/rep_eva01/rep_eva01SearchModel.cs | 5 +++- Models/rep_eva01/rep_eva01Service.cs | 5 ++++ Models/rep_eva02/rep_eva02SearchModel.cs | 2 +- wwwroot/js/rep_eva01/rep_eva01_report.js | 2 +- wwwroot/js/rep_eva02/rep_eva02_report.js | 2 +- 8 files changed, 42 insertions(+), 10 deletions(-) diff --git a/ApiControllers/rep_eva01Controllers.cs b/ApiControllers/rep_eva01Controllers.cs index 54eef82..0b5958d 100644 --- a/ApiControllers/rep_eva01Controllers.cs +++ b/ApiControllers/rep_eva01Controllers.cs @@ -103,6 +103,12 @@ namespace TodoAPI2.Controllers string username = MyHelper.GetConfig(Configuration, "JasperReportServer:username"); string password = MyHelper.GetConfig(Configuration, "JasperReportServer:password"); + var p = (from i in _repository.GetContext().eva_adjust_postponement + where i.id == model.round_id + select i).FirstOrDefault(); + model.date_text = MyHelper.GetDateStringForReport(p.theDate); + model.command_no = p.command_no; + string url = $"{mainurl}{reportsite}/rep_eva01.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}&j_username={username}&j_password={password}"; var data = httpclient.DownloadData(url); diff --git a/Models/external_linkage/external_linkageService.cs b/Models/external_linkage/external_linkageService.cs index c7d5f69..6a0588b 100644 --- a/Models/external_linkage/external_linkageService.cs +++ b/Models/external_linkage/external_linkageService.cs @@ -354,19 +354,37 @@ namespace TodoAPI2.Models return result; } + //public List GetEvaRound() + //{ + // var sql = string.Format("select distinct eva_performance_plan.id,eva_performance_plan.{0}theTime{0} , eva_performance_plan.fiscal_year from eva_performance_plan order by eva_performance_plan.fiscal_year,eva_performance_plan.{0}theTime{0}", '"'.ToString()); + // var para = db.GetParameterListNpgsql(); + // DataTable dt = db.ExecuteDataTableNpgsql(sql, para); + // var result = new List(); + // foreach (DataRow dr in dt.Rows) + // { + // var i = new external_linkageViewModel(); + // i.external_id = Convert.ToInt32(dr["theTime"]); + // i.id_guid = Guid.Parse(dr["id"].ToString()); + // i.external_code = dr["theTime"].ToString(); + // i.external_name = dr["theTime"].ToString() + "/" + dr["fiscal_year"].ToString(); + // result.Add(i); + // } + // return result; + //} + public List GetEvaRound() { - var sql = string.Format("select distinct eva_performance_plan.id,eva_performance_plan.{0}theTime{0} , eva_performance_plan.fiscal_year from eva_performance_plan order by eva_performance_plan.fiscal_year,eva_performance_plan.{0}theTime{0}", '"'.ToString()); + var sql = string.Format("select id,fiscal_year,{0}theRound{0} from eva_adjust_postponement where create_evaluation_id is null order by fiscal_year,{0}theRound{0}", '"'.ToString()); var para = db.GetParameterListNpgsql(); DataTable dt = db.ExecuteDataTableNpgsql(sql, para); var result = new List(); foreach (DataRow dr in dt.Rows) { var i = new external_linkageViewModel(); - i.external_id = Convert.ToInt32(dr["theTime"]); - i.id_guid = Guid.Parse(dr["id"].ToString()); - i.external_code = dr["theTime"].ToString(); - i.external_name = dr["theTime"].ToString() + "/" + dr["fiscal_year"].ToString(); + i.external_id = Convert.ToInt32(dr["id"]); + //i.id_guid = Guid.Parse(dr["id"].ToString()); + i.external_code = dr["theRound"].ToString(); + i.external_name = dr["theRound"].ToString() + "/" + dr["fiscal_year"].ToString(); result.Add(i); } return result; diff --git a/Models/rep_eva01/Irep_eva01Service.cs b/Models/rep_eva01/Irep_eva01Service.cs index e9e3f25..6f90d61 100644 --- a/Models/rep_eva01/Irep_eva01Service.cs +++ b/Models/rep_eva01/Irep_eva01Service.cs @@ -15,7 +15,7 @@ namespace TodoAPI2.Models rep_eva01WithSelectionViewModel GetWithSelection(Guid id); rep_eva01WithSelectionViewModel GetBlankItem(); - + DataContext GetContext(); } } diff --git a/Models/rep_eva01/rep_eva01SearchModel.cs b/Models/rep_eva01/rep_eva01SearchModel.cs index 1955b0a..1544f64 100644 --- a/Models/rep_eva01/rep_eva01SearchModel.cs +++ b/Models/rep_eva01/rep_eva01SearchModel.cs @@ -16,8 +16,11 @@ namespace TodoAPI2.Models public string org_id { get; set; } - public Guid? round_id { get; set; } + public int? round_id { get; set; } public string round_text { get; set; } + + public string command_no { get; set; } + public string date_text { get; set; } } } diff --git a/Models/rep_eva01/rep_eva01Service.cs b/Models/rep_eva01/rep_eva01Service.cs index 6e92f3b..13588ee 100644 --- a/Models/rep_eva01/rep_eva01Service.cs +++ b/Models/rep_eva01/rep_eva01Service.cs @@ -73,6 +73,11 @@ namespace TodoAPI2.Models return i; } + public DataContext GetContext() + { + return _repository.Context; + } + #endregion #endregion diff --git a/Models/rep_eva02/rep_eva02SearchModel.cs b/Models/rep_eva02/rep_eva02SearchModel.cs index e40687e..f6c686a 100644 --- a/Models/rep_eva02/rep_eva02SearchModel.cs +++ b/Models/rep_eva02/rep_eva02SearchModel.cs @@ -16,7 +16,7 @@ namespace TodoAPI2.Models public int? org_id { get; set; } - public Guid? round_id { get; set; } + public int? round_id { get; set; } public string round_text { get; set; } } diff --git a/wwwroot/js/rep_eva01/rep_eva01_report.js b/wwwroot/js/rep_eva01/rep_eva01_report.js index 972c3b3..7f351e2 100644 --- a/wwwroot/js/rep_eva01/rep_eva01_report.js +++ b/wwwroot/js/rep_eva01/rep_eva01_report.js @@ -26,7 +26,7 @@ function rep_eva01_GetSearchParameter(fileType) { function rep_eva01_FeedDataToSearchForm(data) { DropDownClearFormAndFeedWithDataOrg($("#s_rep_eva01_org_id"), data, "id", "external_name", "item_org_id", data.org_id); - DropDownClearFormAndFeedWithData($("#s_rep_eva01_round_id"), data, "id_guid", "external_name", "item_round_id", data.id_guid); + DropDownClearFormAndFeedWithData($("#s_rep_eva01_round_id"), data, "id", "external_name", "item_round_id", data.id_guid); } function DropDownClearFormAndFeedWithDataOrg(d, result, x, y, z, i) { diff --git a/wwwroot/js/rep_eva02/rep_eva02_report.js b/wwwroot/js/rep_eva02/rep_eva02_report.js index f0b0f12..d77a1b7 100644 --- a/wwwroot/js/rep_eva02/rep_eva02_report.js +++ b/wwwroot/js/rep_eva02/rep_eva02_report.js @@ -26,7 +26,7 @@ function rep_eva02_GetSearchParameter(fileType) { function rep_eva02_FeedDataToSearchForm(data) { DropDownClearFormAndFeedWithDataOrg($("#s_rep_eva02_org_id"), data, "id", "external_name", "item_org_id", data.org_id); - DropDownClearFormAndFeedWithData($("#s_rep_eva02_round_id"), data, "id_guid", "external_name", "item_round_id", data.round_id); + DropDownClearFormAndFeedWithData($("#s_rep_eva02_round_id"), data, "id", "external_name", "item_round_id", data.round_id); } function DropDownClearFormAndFeedWithDataOrg(d, result, x, y, z, i) {