From 17453e4f4b7ca6b6342b6f8b7d5f192d2b7ee474 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=98=89=E7=A5=A5=20=E8=A9=B9?= Date: Thu, 27 Mar 2025 15:24:20 +0800 Subject: [PATCH] updates order by --- BackEnd/api/exportExcel.ashx.cs | 2 +- BackEnd/api/userList.ashx.cs | 5 +++-- BackEnd/assets/javascript/custom/userList.js | 2 +- BackEnd/userList.aspx | 2 +- bin/abbott_2024_event.dll | Bin 77824 -> 77824 bytes .../assets/javascript/custom/userList.js | 2 +- bin/app.publish/BackEnd/userList.aspx | 4 ++-- bin/app.publish/bin/abbott_2024_event.dll | Bin 77824 -> 77824 bytes webapi/babyData.ashx.cs | 4 ++++ webapi/bindBabyData.ashx.cs | 5 +++++ webapi/lineLogin.ashx.cs | 5 +++++ 11 files changed, 23 insertions(+), 8 deletions(-) diff --git a/BackEnd/api/exportExcel.ashx.cs b/BackEnd/api/exportExcel.ashx.cs index 87fa53d..34c294b 100644 --- a/BackEnd/api/exportExcel.ashx.cs +++ b/BackEnd/api/exportExcel.ashx.cs @@ -78,7 +78,7 @@ namespace abbott_2024_event.BackEnd.api filiterString += " and babyRec_months >= " + (int.Parse(min_age) * 12).ToString() + " and babyRec_months <= " + (int.Parse(max_age) * 12).ToString(); - List babyDataRecViews = conn.Query("select * from babyDataRecView " + filiterString + " ").ToList(); + List babyDataRecViews = conn.Query("select * from babyDataRecView " + filiterString + " order by babyData_lastTestDate desc ").ToList(); HSSFWorkbook workbook = new HSSFWorkbook(); MemoryStream ms = new MemoryStream(); diff --git a/BackEnd/api/userList.ashx.cs b/BackEnd/api/userList.ashx.cs index f99d2ed..c12e674 100644 --- a/BackEnd/api/userList.ashx.cs +++ b/BackEnd/api/userList.ashx.cs @@ -92,15 +92,16 @@ namespace abbott_2024_event.BackEnd.api filiterString += " and babyRec_months >= " + (int.Parse(min_age) * 12).ToString() + " and babyRec_months <= " + (int.Parse(max_age) * 12).ToString(); - List babyDataRecViews = conn.Query("select distinct line_uid, line_displayname, line_phone from babyDataRecView " + filiterString + " ").ToList(); + List babyDataRecViews = conn.Query("select distinct line_uid, line_displayname, line_phone from babyDataRecView " + filiterString + " ").ToList(); foreach (babyDataRecView view in babyDataRecViews) { userData userData = new userData(); userData.line_uid = view.line_uid; userData.line_displayName = view.line_displayName; userData.line_phone = view.line_phone; + userData.testdate = view.babyData_lastTestDate.ToString("yyyy/MM/dd HH:mm:ss"); - List subViews = conn.Query("select * from babyDataRecView " + filiterString + " and line_uid = @line_uid ", new { line_uid = view.line_uid }).ToList(); + List subViews = conn.Query("select * from babyDataRecView " + filiterString + " and line_uid = @line_uid order by babyRec_recdate desc", new { line_uid = view.line_uid }).ToList(); foreach (babyDataRecView subView in subViews) { babyData babyData = new babyData(); diff --git a/BackEnd/assets/javascript/custom/userList.js b/BackEnd/assets/javascript/custom/userList.js index b9da06c..60bf26d 100644 --- a/BackEnd/assets/javascript/custom/userList.js +++ b/BackEnd/assets/javascript/custom/userList.js @@ -239,7 +239,7 @@ function loadDataTable() { }, - order: [[2, 'desc']], + order: [[3, 'desc']], info: true, search: "搜尋:", searching: true, diff --git a/BackEnd/userList.aspx b/BackEnd/userList.aspx index 59d1fe4..8a71013 100644 --- a/BackEnd/userList.aspx +++ b/BackEnd/userList.aspx @@ -200,5 +200,5 @@ - + diff --git a/bin/abbott_2024_event.dll b/bin/abbott_2024_event.dll index 7ba3018c2e5a97b291278f2099f33857b4c72436..914b472b17978d92a3d8353d3277ebe3771430d0 100644 GIT binary patch delta 8199 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 UID 電話 測驗日期 - 寶寶資料 + 寶寶資料   @@ -200,5 +200,5 @@ - + diff --git a/bin/app.publish/bin/abbott_2024_event.dll b/bin/app.publish/bin/abbott_2024_event.dll index 7ba3018c2e5a97b291278f2099f33857b4c72436..914b472b17978d92a3d8353d3277ebe3771430d0 100644 GIT binary patch delta 8199 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 20) ? utm_source.Substring(0, 20) : utm_source; utm_medium = (utm_medium.Length > 20) ? utm_medium.Substring(0, 20) : utm_medium; utm_campaign = (utm_campaign.Length > 20) ? utm_campaign.Substring(0, 20) : utm_campaign; diff --git a/webapi/bindBabyData.ashx.cs b/webapi/bindBabyData.ashx.cs index 2a4189a..d567e97 100644 --- a/webapi/bindBabyData.ashx.cs +++ b/webapi/bindBabyData.ashx.cs @@ -28,6 +28,11 @@ namespace abbott_2024_event.webapi string babyData_uid = (context.Request["babyData_uid"] == null) ? "" : context.Request["babyData_uid"].ToString(); string temp_key = (context.Request["temp_key"] == null) ? "" : context.Request["temp_key"].ToString(); + if (line_uid == "undefined") + { + line_uid = ""; + } + if (temp_key == "") { objRet.ret = "no"; objRet.err_code = "3001"; diff --git a/webapi/lineLogin.ashx.cs b/webapi/lineLogin.ashx.cs index 99632a5..7afd051 100644 --- a/webapi/lineLogin.ashx.cs +++ b/webapi/lineLogin.ashx.cs @@ -33,6 +33,11 @@ namespace abbott_2024_event.webapi string utm_term = (context.Request["utm_term"] == null) ? "" : context.Request["utm_term"].ToString(); string utm_content = (context.Request["utm_content"] == null) ? "" : context.Request["utm_content"].ToString(); + if (line_uid == "undefined") + { + line_uid = ""; + } + utm_source = (utm_source.Length > 20) ? utm_source.Substring(0, 20) : utm_source; utm_medium = (utm_medium.Length > 20) ? utm_medium.Substring(0, 20) : utm_medium; utm_campaign = (utm_campaign.Length > 20) ? utm_campaign.Substring(0, 20) : utm_campaign;