diff --git a/src/main/java/itn/let/mjo/msg/service/impl/MjonMsgServiceImpl.java b/src/main/java/itn/let/mjo/msg/service/impl/MjonMsgServiceImpl.java index aefa17e2..b4cf5597 100644 --- a/src/main/java/itn/let/mjo/msg/service/impl/MjonMsgServiceImpl.java +++ b/src/main/java/itn/let/mjo/msg/service/impl/MjonMsgServiceImpl.java @@ -679,6 +679,8 @@ public class MjonMsgServiceImpl extends EgovAbstractServiceImpl implements MjonM int FHMmsResult = 0; int JJResult = 0; int IVTResult = 0; + int jjBline01Result = 0; + int jjBline02Result = 0; //아이하트 딜레이문자 삭제 ihResult = mjonReservMsgDAO.deleteIHeartMsgSeqListByMsgSeq(mjonResvMsgVO); @@ -701,9 +703,14 @@ public class MjonMsgServiceImpl extends EgovAbstractServiceImpl implements MjonM //인비토 딜레이문자 삭제 IVTResult = mjonReservMsgDAO.deleteIVTMsgSeqListByMsgSeq(mjonResvMsgVO); + //제이제이 예약취소 삭제 + jjBline01Result = mjonReservMsgDAO.deleteJJB01MsgSeqListByMsgSeq(mjonResvMsgVO); + + //제이제이 예약취소 삭제 + jjBline02Result = mjonReservMsgDAO.deleteJJB02MsgSeqListByMsgSeq(mjonResvMsgVO); //삭제 결과 합산 - resultSts = ihResult + FHSmsResult + FHMmsResult + imoResult +bizResult + JJResult + IVTResult; + resultSts = ihResult + FHSmsResult + FHMmsResult + imoResult +bizResult + JJResult + IVTResult + jjBline01Result + jjBline02Result; System.out.println("++++++++++++++++++++++++++++++ resultSts ::: "+resultSts); @@ -775,6 +782,9 @@ public class MjonMsgServiceImpl extends EgovAbstractServiceImpl implements MjonM int FHMmsResult = 0; int JJResult = 0; int IVTResult = 0; + int JJB01Result = 0; + int JJB02Result = 0; + //아이하트 딜레이문자 즉시발송 처리 //ihResult = mjonReservMsgDAO.deleteIHeartMsgSeqListByMsgSeq(mjonResvMsgVO); @@ -798,8 +808,14 @@ public class MjonMsgServiceImpl extends EgovAbstractServiceImpl implements MjonM //제이제이 딜레이문자 즉시발송 처리 IVTResult = mjonReservMsgDAO.updateRealTimeIVTMsgSeqListByMsgSeq(mjonResvMsgVO); + //제이제이 B01 딜레이문자 즉시발송 처리 + JJB01Result = mjonReservMsgDAO.updateRealTimeJJB01MsgSeqListByMsgSeq(mjonResvMsgVO); + + //제이제이 B02 딜레이문자 즉시발송 처리 + JJB02Result = mjonReservMsgDAO.updateRealTimeJJB02MsgSeqListByMsgSeq(mjonResvMsgVO); + //삭제 결과 합산 - resultSts = ihResult + FHSmsResult + FHMmsResult + imoResult +bizResult + JJResult + IVTResult; + resultSts = ihResult + FHSmsResult + FHMmsResult + imoResult +bizResult + JJResult + IVTResult + JJB01Result + JJB02Result; System.out.println("++++++++++++++++++++++++++++++ resultSts ::: "+resultSts); 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..34cc94ae 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{ @@ -235,4 +256,25 @@ public class MjonReservMsgDAO extends EgovAbstractDAO { return update("MjonReservMsgDAO.updateRealTimeIVTMsgSeqListByMsgSeq", mjonResvMsgVO); } + /** + * @Method Name : updateRealTimeJJB01MsgSeqListByMsgSeq + * @작성일 : 2023. 06. 20. + * @작성자 : WYD + * @Method 설명 : 제이제이 B01라인 지연처리 문자 즉시 발송 + */ + public int updateRealTimeJJB01MsgSeqListByMsgSeq(MjonResvMsgVO mjonResvMsgVO) { + + return update("MjonReservMsgDAO.updateRealTimeJJB01MsgSeqListByMsgSeq", mjonResvMsgVO); + } + + /** + * @Method Name : updateRealTimeJJB02MsgSeqListByMsgSeq + * @작성일 : 2023. 06. 20. + * @작성자 : WYD + * @Method 설명 : 제이제이 B02라인 지연처리 문자 즉시 발송 + */ + public int updateRealTimeJJB02MsgSeqListByMsgSeq(MjonResvMsgVO mjonResvMsgVO) { + + return update("MjonReservMsgDAO.updateRealTimeJJB02MsgSeqListByMsgSeq", mjonResvMsgVO); + } } 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..418cb100 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 jjB01Result = 0; + int jjB02Result = 0; //아이하트 예약취소 삭제 ihResult = mjonReservMsgDAO.deleteIHeartMsgSeqListByMsgSeq(mjonResvMsgVO); @@ -131,8 +133,14 @@ public class MjonReservMsgServiceImpl extends EgovAbstractServiceImpl implements //인비토 예약취소 삭제 ivtResult = mjonReservMsgDAO.deleteIVTMsgSeqListByMsgSeq(mjonResvMsgVO); + //제이제이 B01 예약취소 삭제 + jjB01Result = mjonReservMsgDAO.deleteJJB01MsgSeqListByMsgSeq(mjonResvMsgVO); + + //제이제이 B02 예약취소 삭제 + jjB02Result = mjonReservMsgDAO.deleteJJB02MsgSeqListByMsgSeq(mjonResvMsgVO); + //삭제 결과 합산 - result = ihResult + FHSmsResult + FHMmsResult + imoResult + bizResult +jjResult + ivtResult; + result = ihResult + FHSmsResult + FHMmsResult + imoResult + bizResult +jjResult + ivtResult + jjB01Result + jjB02Result; //각 전송사별 문자 발송 테이블에서 데이터 삭제 처리 /*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..29a04ade 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(){ 문자분류 - - + +