diff --git a/src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java b/src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java index bd2ac55c..d3513f0d 100644 --- a/src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java +++ b/src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java @@ -162,7 +162,14 @@ public class MjonMsgVO extends ComDefaultVO{ private String searchMsgResultCode; // 발송결과 검색필터 private String reqFullDate; + private String blineCode; + public String getBlineCode() { + return blineCode; + } + public void setBlineCode(String blineCode) { + this.blineCode = blineCode; + } public String getReqFullDate() { return reqFullDate; } diff --git a/src/main/java/itn/let/mjo/pay/service/MjonPayVO.java b/src/main/java/itn/let/mjo/pay/service/MjonPayVO.java index abb7083a..1ecc5485 100644 --- a/src/main/java/itn/let/mjo/pay/service/MjonPayVO.java +++ b/src/main/java/itn/let/mjo/pay/service/MjonPayVO.java @@ -67,9 +67,17 @@ public class MjonPayVO extends ComDefaultVO{ private String sendUserId; // 보내는 사용자 아이디 private String recvUserId; // 받는 사용자 아이디 private String admUserId; // 관리자 아이디 + private String blineCode; - + public String getBlineCode() { + return blineCode; + } + + public void setBlineCode(String blineCode) { + this.blineCode = blineCode; + } + public double getTotalPrice() { return totalPrice; } diff --git a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml index 63e67f64..6c6afa7f 100644 --- a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml @@ -601,6 +601,7 @@ , M.smishingYn , M.vipYn , M.userCallbackYn + , M.blineCode , M.delayYn , M.delayCompleteYn , (SELECT @@ -710,6 +711,7 @@ , LMB.SMISHING_YN AS smishingYn , LMB.VIP_YN AS vipYn , LMB.CALLBACK_YN AS userCallbackYn + , IFNULL(LMB.BLINE_CODE, 'N') AS blineCode , A.DELAY_YN AS delayYn , A.DELAY_COMPLETE_YN AS delayCompleteYn FROM diff --git a/src/main/resources/egovframework/sqlmap/let/pay/MjonPay_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/pay/MjonPay_SQL_mysql.xml index 2ac8b077..a4feee45 100644 --- a/src/main/resources/egovframework/sqlmap/let/pay/MjonPay_SQL_mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/pay/MjonPay_SQL_mysql.xml @@ -103,6 +103,7 @@ , EMI.EVENT_PG_MOID AS eventMoid , mber.SMISHING_YN AS smishingYn , mber.VIP_YN AS vipYn + , IFNULL(mber.BLINE_CODE, 'N') AS blineCode , (SELECT COUNT(0) FROM MJ_PG SP WHERE SP.PG_STATUS = 1 AND SP.USER_ID = A.USER_ID diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendMsgList.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendMsgList.jsp index f530089c..f87ed1c5 100644 --- a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendMsgList.jsp +++ b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendMsgList.jsp @@ -499,7 +499,7 @@ function fnSmishingUpdate(flag) {