From e556b245f5098e63c8c740d590500d73721b9cb9 Mon Sep 17 00:00:00 2001 From: wyh Date: Mon, 19 Jun 2023 15:03:26 +0900 Subject: [PATCH] =?UTF-8?q?B=EB=9D=BC=EC=9D=B8=20=EC=A0=84=EC=86=A1=20?= =?UTF-8?q?=EB=B0=8F=20=EC=98=88=EC=95=BD=EC=B7=A8=EC=86=8C=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/MjonMsgDataServiceImpl.java | 12 ++++++----- .../msgdata/web/MjonMsgDataController.java | 4 ++++ .../service/impl/MjonReservMsgDAO.java | 21 +++++++++++++++++++ .../impl/MjonReservMsgServiceImpl.java | 10 ++++++++- .../sqlmap/let/msg/MjonMsgResv_SQL_mysql.xml | 20 ++++++++++++++++++ .../jsp/web/msgdata/MsgDataSMLView.jsp | 15 ++++++++++--- 6 files changed, 73 insertions(+), 9 deletions(-) diff --git a/src/main/java/itn/let/mjo/msgdata/service/impl/MjonMsgDataServiceImpl.java b/src/main/java/itn/let/mjo/msgdata/service/impl/MjonMsgDataServiceImpl.java index 578585a9..a34ea544 100644 --- a/src/main/java/itn/let/mjo/msgdata/service/impl/MjonMsgDataServiceImpl.java +++ b/src/main/java/itn/let/mjo/msgdata/service/impl/MjonMsgDataServiceImpl.java @@ -185,11 +185,13 @@ public class MjonMsgDataServiceImpl extends EgovAbstractServiceImpl implements M mberRepAgent = tmp.getRepAgent(); String useYn = tmp.getUseYn(); - //회원 전용 전송사의 전송 비율이 0 이면 대표전송사로 전송되도록 셋팅함. - if(mberSendRate.equals("0") || useYn.equals("N")) { - - hotlineAgentCode = mberRepAgent; - + if(userInfo.getBlineCode().equals("N")) { + //회원 전용 전송사의 전송 비율이 0 이면 대표전송사로 전송되도록 셋팅함. + if(mberSendRate.equals("0") || useYn.equals("N")) { + + hotlineAgentCode = mberRepAgent; + + } } } diff --git a/src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java b/src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java index 007dcd5c..0cd66d53 100644 --- a/src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java +++ b/src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java @@ -504,6 +504,10 @@ public class MjonMsgDataController { mberManageVO = mjonMsgDataService.selectMberManageInfo(userId); searchVO.setUserId(userId); + + model.addAttribute("blineCode", mberManageVO.getBlineCode()); + + } model.addAttribute("exceptSpamYn", mberManageVO.getExceptSpamYn()); diff --git a/src/main/java/itn/let/mjo/reservmsg/service/impl/MjonReservMsgDAO.java b/src/main/java/itn/let/mjo/reservmsg/service/impl/MjonReservMsgDAO.java index f2ac1e64..ba9c0be6 100644 --- a/src/main/java/itn/let/mjo/reservmsg/service/impl/MjonReservMsgDAO.java +++ b/src/main/java/itn/let/mjo/reservmsg/service/impl/MjonReservMsgDAO.java @@ -138,6 +138,27 @@ public class MjonReservMsgDAO extends EgovAbstractDAO { return update("MjonReservMsgDAO.deleteIVTMsgSeqListByMsgSeq", mjonResvMsgVO); } + /** + * @Method Name : deleteJJB01MsgSeqListByMsgSeq + * @작성일 : 2023. 06. 19. + * @작성자 : WYH + * @Method 설명 : 제이제이 B01라인 예약취소 삭제 + */ + public int deleteJJB01MsgSeqListByMsgSeq(MjonResvMsgVO mjonResvMsgVO) throws Exception{ + + return update("MjonReservMsgDAO.deleteJJB01MsgSeqListByMsgSeq", mjonResvMsgVO); + } + + /** + * @Method Name : deleteJJB02MsgSeqListByMsgSeq + * @작성일 : 2023. 06. 19. + * @작성자 : WYH + * @Method 설명 : 제이제이 B02라인 예약취소 삭제 + */ + public int deleteJJB02MsgSeqListByMsgSeq(MjonResvMsgVO mjonResvMsgVO) throws Exception{ + + return update("MjonReservMsgDAO.deleteJJB02MsgSeqListByMsgSeq", mjonResvMsgVO); + } public void updateResvMsgCancelDataFlag(MjonResvMsgVO mjonResvMsgVO) throws Exception{ diff --git a/src/main/java/itn/let/mjo/reservmsg/service/impl/MjonReservMsgServiceImpl.java b/src/main/java/itn/let/mjo/reservmsg/service/impl/MjonReservMsgServiceImpl.java index e16de3a6..caa0241a 100644 --- a/src/main/java/itn/let/mjo/reservmsg/service/impl/MjonReservMsgServiceImpl.java +++ b/src/main/java/itn/let/mjo/reservmsg/service/impl/MjonReservMsgServiceImpl.java @@ -109,6 +109,8 @@ public class MjonReservMsgServiceImpl extends EgovAbstractServiceImpl implements int ivtResult = 0; int FHSmsResult = 0; int FHMmsResult = 0; + int jjBline01 = 0; + int jjBline02 = 0; //아이하트 예약취소 삭제 ihResult = mjonReservMsgDAO.deleteIHeartMsgSeqListByMsgSeq(mjonResvMsgVO); @@ -131,8 +133,14 @@ public class MjonReservMsgServiceImpl extends EgovAbstractServiceImpl implements //인비토 예약취소 삭제 ivtResult = mjonReservMsgDAO.deleteIVTMsgSeqListByMsgSeq(mjonResvMsgVO); + //제이제이 예약취소 삭제 + jjBline01 = mjonReservMsgDAO.deleteJJB01MsgSeqListByMsgSeq(mjonResvMsgVO); + + //제이제이 예약취소 삭제 + jjBline02 = mjonReservMsgDAO.deleteJJB02MsgSeqListByMsgSeq(mjonResvMsgVO); + //삭제 결과 합산 - result = ihResult + FHSmsResult + FHMmsResult + imoResult + bizResult +jjResult + ivtResult; + result = ihResult + FHSmsResult + FHMmsResult + imoResult + bizResult +jjResult + ivtResult + jjBline01 + jjBline02; //각 전송사별 문자 발송 테이블에서 데이터 삭제 처리 /*if(agentCode.equals("01")) { //아이하트 메세지 삭제 diff --git a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgResv_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgResv_SQL_mysql.xml index 5e033a0a..cdf4d145 100644 --- a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgResv_SQL_mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgResv_SQL_mysql.xml @@ -572,6 +572,26 @@ + + + DELETE FROM MTMSG_B1_DATA + WHERE 1=1 + + #userDataList[]# + + + + + + + DELETE FROM MTMSG_B2_DATA + WHERE 1=1 + + #userDataList[]# + + + + - + "/> +

문자전송

@@ -3525,8 +3534,8 @@ $(".btn_event_cash").off().on("click", function(){ 문자분류 - - + +