From eb9b91cb7c87f01ff119478fce752e546b5bfda9 Mon Sep 17 00:00:00 2001 From: "DESKTOP-O51VFUQ\\jw" Date: Fri, 31 Jul 2026 16:18:21 +0900 Subject: [PATCH] =?UTF-8?q?=EC=B6=A9=EC=A0=84=EC=A4=91=20=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=EC=A1=B0=ED=9A=8C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vpp/rechgingList/RechgingListService.java | 2 +- .../RechgingListSpecification.java | 17 +++++++- .../templates/system/rechgingList/list.html | 43 +++++++++++-------- 3 files changed, 40 insertions(+), 22 deletions(-) diff --git a/src/main/java/net/jwsi/jcms/vpp/rechgingList/RechgingListService.java b/src/main/java/net/jwsi/jcms/vpp/rechgingList/RechgingListService.java index a0a58a5..dcf4b40 100644 --- a/src/main/java/net/jwsi/jcms/vpp/rechgingList/RechgingListService.java +++ b/src/main/java/net/jwsi/jcms/vpp/rechgingList/RechgingListService.java @@ -89,7 +89,7 @@ public class RechgingListService extends BaseService cb.like(root.get("creditPPayTrxDt"), StrUtil.sqlLikeParam(creditPPayTrxDt)); } - public static Specification rechgSdt(String rechgSdt) { - return (root, query, cb) -> cb.like(root.get("rechgSdt"), StrUtil.sqlLikeParam(rechgSdt)); + public static Specification rechgSdtBetween(String rechgSdt) { + return (root, query, cb) -> { + // 날짜 파라미터가 없으면 검색 조건에서 제외 (null 반환) + if (!StringUtils.hasText(rechgSdt)) { + return null; + } + + // 예: "2026-07-31" -> "2026-07-31 00:00:00" ~ "2026-07-31 23:59:59" + String startDateTime = rechgSdt.trim() + " 00:00:00"; + String endDateTime = rechgSdt.trim() + " 23:59:59"; + + return cb.between(root.get("rechgSdt"), startDateTime, endDateTime); + }; } + public static Specification payType(String payType) { return (root, query, cb) -> cb.like(root.get("payType"), StrUtil.sqlLikeParam(payType)); } diff --git a/src/main/resources/templates/system/rechgingList/list.html b/src/main/resources/templates/system/rechgingList/list.html index 596f733..33952a4 100644 --- a/src/main/resources/templates/system/rechgingList/list.html +++ b/src/main/resources/templates/system/rechgingList/list.html @@ -30,12 +30,12 @@ -
-
- 플러그 타입 - -
-
+ + + + + +
회원카드번호 @@ -48,16 +48,16 @@
-
-
- 신용카드 승인일시 - -
-
+ + + + + +
충전 시작일시 - +
@@ -66,12 +66,17 @@ -
-
- 결제타입 - -
-
+ + + + + + + + + + +