diff --git a/src/main/java/itn/let/kakao/user/sent/service/KakaoSentVO.java b/src/main/java/itn/let/kakao/user/sent/service/KakaoSentVO.java index f600ebae..b6802230 100644 --- a/src/main/java/itn/let/kakao/user/sent/service/KakaoSentVO.java +++ b/src/main/java/itn/let/kakao/user/sent/service/KakaoSentVO.java @@ -110,8 +110,8 @@ public class KakaoSentVO extends UserDefaultVO{ private String statusCd; - private int successPrice; - private int kakaoResendSuccPrice; + private String successPrice; + private String kakaoResendSuccPrice; private String divideYn; diff --git a/src/main/java/itn/let/kakao/user/sent/service/impl/KakaoSentServiceImpl.java b/src/main/java/itn/let/kakao/user/sent/service/impl/KakaoSentServiceImpl.java index 0a622283..70f58ece 100644 --- a/src/main/java/itn/let/kakao/user/sent/service/impl/KakaoSentServiceImpl.java +++ b/src/main/java/itn/let/kakao/user/sent/service/impl/KakaoSentServiceImpl.java @@ -299,7 +299,7 @@ public class KakaoSentServiceImpl extends EgovAbstractServiceImpl implements Ka } - private String priceProc(int successPrice, int kakaoResendSuccPrice) { + private String priceProc(String successPrice, String kakaoResendSuccPrice) { String totPrice = "-"; @@ -311,7 +311,8 @@ public class KakaoSentServiceImpl extends EgovAbstractServiceImpl implements Ka BigDecimal totalPrice = atPrice.add(kakaoResendPrice); // 소수점 한 자리로 설정 (반올림)// totalPrice 값을 소수점 한 자리까지 반올림하여 roundedTotalPrice에 저장 // RoundingMode.HALF_UP: 반올림 방식으로, 소수점 기준 5 이상이면 올림, 그렇지 않으면 내림 - BigDecimal roundedTotalPrice = totalPrice.setScale(1, RoundingMode.HALF_UP); +// BigDecimal roundedTotalPrice = totalPrice.setScale(1, RoundingMode.HALF_UP); + BigDecimal roundedTotalPrice = totalPrice; // roundedTotalPrice가 0인지 확인 // BigDecimal.compareTo(BigDecimal.ZERO)는 값을 비교하는 메서드 diff --git a/src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml index 4223f1d2..07788c08 100644 --- a/src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml @@ -1458,6 +1458,11 @@ AND B.RESERVE_YN = 'N' + + + AND B.SMS_TXT like CONCAT('%', #searchKeyword#, '%') + + GROUP BY B.MSG_GROUP_ID ORDER BY 1=1 @@ -1547,126 +1552,67 @@ diff --git a/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentAllListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentAllListAjax.jsp index 10115704..c9493122 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentAllListAjax.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentAllListAjax.jsp @@ -228,7 +228,8 @@ function fn_sentDetailView(msgGroupId) { - + +<%-- --%> diff --git a/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentView.jsp b/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentView.jsp index d418e9f5..504ec839 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentView.jsp @@ -203,14 +203,15 @@ function fnTabLoad(tabType, tabNum){ function fnSearch(pageNo){ - var form = document.searchForm; +// var form = document.searchForm; - form.pageIndex.value = pageNo ; +// form.pageIndex.value = pageNo ; - form.action="/web/kakao/sent/selectKakaoSentView.do"; - form.submit(); - +// form.action="/web/kakao/sent/selectKakaoSentView.do"; +// form.submit(); + cntSet(); + linkPage(pageNo); } function fnExcelDownLoad(pageType, listType){ @@ -467,9 +468,9 @@ function fnDelete(){