Commit @dd47bce050ce208701c21875df3d30394676d6dd

wyh 2023-06-20

Merge branch 'wyh'

@dd47bce050ce208701c21875df3d30394676d6dd

b4f3565

dd47bce

src/main/java/itn/let/mjo/msg/service/impl/MjonMsgServiceImpl.java

--- src/main/java/itn/let/mjo/msg/service/impl/MjonMsgServiceImpl.java

+++ src/main/java/itn/let/mjo/msg/service/impl/MjonMsgServiceImpl.java


 			int FHMmsResult = 0;
 			int JJResult = 0;
 			int IVTResult = 0;
+			int jjBline01Result = 0;
+			int jjBline02Result = 0;
 			
 			//아이하트 딜레이문자 삭제
 			ihResult = mjonReservMsgDAO.deleteIHeartMsgSeqListByMsgSeq(mjonResvMsgVO);

 			//인비토 딜레이문자 삭제
 			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);
 			

 			int FHMmsResult = 0;
 			int JJResult = 0;
 			int IVTResult = 0;
+			int JJB01Result = 0;
+			int JJB02Result = 0;
+			
 			
 			//아이하트 딜레이문자 즉시발송 처리
 			//ihResult = mjonReservMsgDAO.deleteIHeartMsgSeqListByMsgSeq(mjonResvMsgVO);

 			//제이제이 딜레이문자 즉시발송 처리
 			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);
 			

b4f3565

dd47bce

src/main/java/itn/let/mjo/msgdata/service/impl/MjonMsgDataServiceImpl.java

--- src/main/java/itn/let/mjo/msgdata/service/impl/MjonMsgDataServiceImpl.java

+++ src/main/java/itn/let/mjo/msgdata/service/impl/MjonMsgDataServiceImpl.java


 				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;
+						
+					}
 				}
 				
 			}

b4f3565

dd47bce

src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java

--- src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java

+++ src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java


 			mberManageVO = mjonMsgDataService.selectMberManageInfo(userId);
 			searchVO.setUserId(userId);
 			
+			
+			model.addAttribute("blineCode", mberManageVO.getBlineCode());
+			
+			
 		}
 		
 		model.addAttribute("exceptSpamYn", mberManageVO.getExceptSpamYn());

b4f3565

dd47bce

src/main/java/itn/let/mjo/reservmsg/service/impl/MjonReservMsgDAO.java

--- src/main/java/itn/let/mjo/reservmsg/service/impl/MjonReservMsgDAO.java

+++ src/main/java/itn/let/mjo/reservmsg/service/impl/MjonReservMsgDAO.java

...	...	@@ -138,6 +138,27 @@
138	138	return update("MjonReservMsgDAO.deleteIVTMsgSeqListByMsgSeq", mjonResvMsgVO);
139	139	}
140	140
	141	+ /**
	142	+ * @Method Name : deleteJJB01MsgSeqListByMsgSeq
	143	+ * @작성일 : 2023. 06. 19.
	144	+ * @작성자 : WYH
	145	+ * @Method 설명 : 제이제이 B01라인 예약취소 삭제
	146	+ */
	147	+ public int deleteJJB01MsgSeqListByMsgSeq(MjonResvMsgVO mjonResvMsgVO) throws Exception{
	148	+
	149	+ return update("MjonReservMsgDAO.deleteJJB01MsgSeqListByMsgSeq", mjonResvMsgVO);
	150	+ }
	151	+
	152	+ /**
	153	+ * @Method Name : deleteJJB02MsgSeqListByMsgSeq
	154	+ * @작성일 : 2023. 06. 19.
	155	+ * @작성자 : WYH
	156	+ * @Method 설명 : 제이제이 B02라인 예약취소 삭제
	157	+ */
	158	+ public int deleteJJB02MsgSeqListByMsgSeq(MjonResvMsgVO mjonResvMsgVO) throws Exception{
	159	+
	160	+ return update("MjonReservMsgDAO.deleteJJB02MsgSeqListByMsgSeq", mjonResvMsgVO);
	161	+ }
141	162
142	163	public void updateResvMsgCancelDataFlag(MjonResvMsgVO mjonResvMsgVO) throws Exception{
143	164
...	...	@@ -235,4 +256,25 @@
235	256	return update("MjonReservMsgDAO.updateRealTimeIVTMsgSeqListByMsgSeq", mjonResvMsgVO);
236	257	}
237	258
	259	+ /**
	260	+ * @Method Name : updateRealTimeJJB01MsgSeqListByMsgSeq
	261	+ * @작성일 : 2023. 06. 20.
	262	+ * @작성자 : WYD
	263	+ * @Method 설명 : 제이제이 B01라인 지연처리 문자 즉시 발송
	264	+ */
	265	+ public int updateRealTimeJJB01MsgSeqListByMsgSeq(MjonResvMsgVO mjonResvMsgVO) {
	266	+
	267	+ return update("MjonReservMsgDAO.updateRealTimeJJB01MsgSeqListByMsgSeq", mjonResvMsgVO);
	268	+ }
	269	+
	270	+ /**
	271	+ * @Method Name : updateRealTimeJJB02MsgSeqListByMsgSeq
	272	+ * @작성일 : 2023. 06. 20.
	273	+ * @작성자 : WYD
	274	+ * @Method 설명 : 제이제이 B02라인 지연처리 문자 즉시 발송
	275	+ */
	276	+ public int updateRealTimeJJB02MsgSeqListByMsgSeq(MjonResvMsgVO mjonResvMsgVO) {
	277	+
	278	+ return update("MjonReservMsgDAO.updateRealTimeJJB02MsgSeqListByMsgSeq", mjonResvMsgVO);
	279	+ }
238	280	}

b4f3565

dd47bce

src/main/java/itn/let/mjo/reservmsg/service/impl/MjonReservMsgServiceImpl.java

--- src/main/java/itn/let/mjo/reservmsg/service/impl/MjonReservMsgServiceImpl.java

+++ src/main/java/itn/let/mjo/reservmsg/service/impl/MjonReservMsgServiceImpl.java


 			int ivtResult = 0;
 			int FHSmsResult = 0;
 			int FHMmsResult = 0;
+			int jjB01Result = 0;
+			int jjB02Result = 0;
 			
 			//아이하트 예약취소 삭제
 			ihResult = mjonReservMsgDAO.deleteIHeartMsgSeqListByMsgSeq(mjonResvMsgVO);

 			//인비토 예약취소 삭제
 			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")) { //아이하트 메세지 삭제

b4f3565

dd47bce

src/main/resources/egovframework/sqlmap/let/msg/MjonMsgResv_SQL_mysql.xml

--- src/main/resources/egovframework/sqlmap/let/msg/MjonMsgResv_SQL_mysql.xml

+++ src/main/resources/egovframework/sqlmap/let/msg/MjonMsgResv_SQL_mysql.xml

...	...	@@ -572,6 +572,26 @@
572	572
573	573	</delete>
574	574
	575	+ <delete id="MjonReservMsgDAO.deleteJJB01MsgSeqListByMsgSeq" parameterClass="mjonMsgResvVO">
	576	+
	577	+ DELETE FROM MTMSG_B1_DATA
	578	+ WHERE 1=1
	579	+ <iterate prepend="AND USERDATA IN" open="(" close=")" conjunction="," property="userDataList">
	580	+ #userDataList[]#
	581	+ </iterate>
	582	+
	583	+ </delete>
	584	+
	585	+ <delete id="MjonReservMsgDAO.deleteJJB02MsgSeqListByMsgSeq" parameterClass="mjonMsgResvVO">
	586	+
	587	+ DELETE FROM MTMSG_B2_DATA
	588	+ WHERE 1=1
	589	+ <iterate prepend="AND USERDATA IN" open="(" close=")" conjunction="," property="userDataList">
	590	+ #userDataList[]#
	591	+ </iterate>
	592	+
	593	+ </delete>
	594	+
575	595	<select id="MjonReservMsgDAO.selectFileNmToAtchFileIdInfo" parameterClass="fileVO" resultClass="fileVO">
576	596
577	597	SELECT ATCH_FILE_ID AS atchFileId,
...	...	@@ -663,6 +683,30 @@
663	683
664	684	</update>
665	685
	686	+ <update id="MjonReservMsgDAO.updateRealTimeJJB01MsgSeqListByMsgSeq" parameterClass="mjonMsgResvVO">
	687	+
	688	+ UPDATE MTMSG_B1_DATA
	689	+ SET INPUT_DATE = NOW() ,
	690	+ RES_DATE = NOW()
	691	+ WHERE 1=1
	692	+ <iterate prepend="AND USERDATA IN" open="(" close=")" conjunction="," property="userDataList">
	693	+ #userDataList[]#
	694	+ </iterate>
	695	+
	696	+ </update>
	697	+
	698	+ <update id="MjonReservMsgDAO.updateRealTimeJJB02MsgSeqListByMsgSeq" parameterClass="mjonMsgResvVO">
	699	+
	700	+ UPDATE MTMSG_B2_DATA
	701	+ SET INPUT_DATE = NOW() ,
	702	+ RES_DATE = NOW()
	703	+ WHERE 1=1
	704	+ <iterate prepend="AND USERDATA IN" open="(" close=")" conjunction="," property="userDataList">
	705	+ #userDataList[]#
	706	+ </iterate>
	707	+
	708	+ </update>
	709	+
666	710	</sqlMap>
667	711
668	712

b4f3565

dd47bce

src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp

--- src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp

+++ src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp


 
 $(document).ready(function (){
 	
+	// Bline 확연 및 라디오 버튼 클릭 이벤트 추가
+	var blineCodeYn = $("#blineCode").val();
+	if(blineCodeYn != 'N' && blineCodeYn != ''){
+		$('input[name="send_adYn"]').val(['Y']);
+		$(".send_adYnN").css('display', 'none');
+		advMsgInsert();
+	}
+	
 	//미리보기 이미지 영역 숨김 처리
 	$('.preiew_img').hide();
 	$('.prePhoto').hide();

 		<input type="hidden" id="evnShortMsgCnt" name="evnShortMsgCnt" value="0"/><!-- 치환 이벤트 단문 건수 -->
 		<input type="hidden" id="evnLongMsgCnt" name="evnLongMsgCnt" value="0"/><!-- 치환 이벤트 장문 건수 -->
 		
-
+		<input type="hidden" id="blineCode" name="blineCode" value="<c:out value="${blineCode}"/>"/>
+		
 	<!-- <div class="top_content current" id="tab1_1"> -->
 	    <div class="heading">
 	        <h2>문자전송</h2>

 	                    <tr>
 	                        <th scope="row">문자분류</th>
 	                        <td class="send_cf">
-	                            <input id="send_adYnN" type="radio"name="send_adYn" value="N" checked="checked">
-	                            <label for="send_adYnN">일반</label>
+	                            <input class="send_adYnN" id="send_adYnN" type="radio"name="send_adYn" value="N" checked="checked">
+	                            <label class="send_adYnN" for="send_adYnN">일반</label>
 	                            <input id="send_adYnY" type="radio" name="send_adYn" value="Y">
 	                            <label for="send_adYnY">광고</label>
 	                        </td>

Add a comment

Open 0
Closed 0

List

...	...	@@ -185,11 +185,13 @@
185	185	mberRepAgent = tmp.getRepAgent();
186	186	String useYn = tmp.getUseYn();
187	187
188		- //회원 전용 전송사의 전송 비율이 0 이면 대표전송사로 전송되도록 셋팅함.
189		- if(mberSendRate.equals("0") \|\| useYn.equals("N")) {
190		-
191		- hotlineAgentCode = mberRepAgent;
192		-
	188	+ if(userInfo.getBlineCode().equals("N")) {
	189	+ //회원 전용 전송사의 전송 비율이 0 이면 대표전송사로 전송되도록 셋팅함.
	190	+ if(mberSendRate.equals("0") \|\| useYn.equals("N")) {
	191	+
	192	+ hotlineAgentCode = mberRepAgent;
	193	+
	194	+ }
193	195	}
194	196
195	197	}

...	...	@@ -504,6 +504,10 @@
504	504	mberManageVO = mjonMsgDataService.selectMberManageInfo(userId);
505	505	searchVO.setUserId(userId);
506	506
	507	+
	508	+ model.addAttribute("blineCode", mberManageVO.getBlineCode());
	509	+
	510	+
507	511	}
508	512
509	513	model.addAttribute("exceptSpamYn", mberManageVO.getExceptSpamYn());

...	...	@@ -451,6 +451,14 @@
451	451
452	452	$(document).ready(function (){
453	453
	454	+ // Bline 확연 및 라디오 버튼 클릭 이벤트 추가
	455	+ var blineCodeYn = $("#blineCode").val();
	456	+ if(blineCodeYn != 'N' && blineCodeYn != ''){
	457	+ $('input[name="send_adYn"]').val(['Y']);
	458	+ $(".send_adYnN").css('display', 'none');
	459	+ advMsgInsert();
	460	+ }
	461	+
454	462	//미리보기 이미지 영역 숨김 처리
455	463	$('.preiew_img').hide();
456	464	$('.prePhoto').hide();
...	...	@@ -3496,7 +3504,8 @@
3496	3504	<input type="hidden" id="evnShortMsgCnt" name="evnShortMsgCnt" value="0"/><!-- 치환 이벤트 단문 건수 -->
3497	3505	<input type="hidden" id="evnLongMsgCnt" name="evnLongMsgCnt" value="0"/><!-- 치환 이벤트 장문 건수 -->
3498	3506
3499		-
	3507	+ <input type="hidden" id="blineCode" name="blineCode" value="<c:out value="${blineCode}"/>"/>
	3508	+
3500	3509	<!-- <div class="top_content current" id="tab1_1"> -->
3501	3510	<div class="heading">
3502	3511	<h2>문자전송</h2>
...	...	@@ -3525,8 +3534,8 @@
3525	3534	<tr>
3526	3535	<th scope="row">문자분류</th>
3527	3536	<td class="send_cf">
3528		- <input id="send_adYnN" type="radio"name="send_adYn" value="N" checked="checked">
3529		- <label for="send_adYnN">일반</label>
	3537	+ <input class="send_adYnN" id="send_adYnN" type="radio"name="send_adYn" value="N" checked="checked">
	3538	+ <label class="send_adYnN" for="send_adYnN">일반</label>
3530	3539	<input id="send_adYnY" type="radio" name="send_adYn" value="Y">
3531	3540	<label for="send_adYnY">광고</label>
3532	3541	</td>

...	...	@@ -679,6 +679,8 @@
679	679	int FHMmsResult = 0;
680	680	int JJResult = 0;
681	681	int IVTResult = 0;
	682	+ int jjBline01Result = 0;
	683	+ int jjBline02Result = 0;
682	684
683	685	//아이하트 딜레이문자 삭제
684	686	ihResult = mjonReservMsgDAO.deleteIHeartMsgSeqListByMsgSeq(mjonResvMsgVO);
...	...	@@ -701,9 +703,14 @@
701	703	//인비토 딜레이문자 삭제
702	704	IVTResult = mjonReservMsgDAO.deleteIVTMsgSeqListByMsgSeq(mjonResvMsgVO);
703	705
	706	+ //제이제이 예약취소 삭제
	707	+ jjBline01Result = mjonReservMsgDAO.deleteJJB01MsgSeqListByMsgSeq(mjonResvMsgVO);
	708	+
	709	+ //제이제이 예약취소 삭제
	710	+ jjBline02Result = mjonReservMsgDAO.deleteJJB02MsgSeqListByMsgSeq(mjonResvMsgVO);
704	711
705	712	//삭제 결과 합산
706		- resultSts = ihResult + FHSmsResult + FHMmsResult + imoResult +bizResult + JJResult + IVTResult;
	713	+ resultSts = ihResult + FHSmsResult + FHMmsResult + imoResult +bizResult + JJResult + IVTResult + jjBline01Result + jjBline02Result;
707	714
708	715	System.out.println("++++++++++++++++++++++++++++++ resultSts ::: "+resultSts);
709	716
...	...	@@ -775,6 +782,9 @@
775	782	int FHMmsResult = 0;
776	783	int JJResult = 0;
777	784	int IVTResult = 0;
	785	+ int JJB01Result = 0;
	786	+ int JJB02Result = 0;
	787	+
778	788
779	789	//아이하트 딜레이문자 즉시발송 처리
780	790	//ihResult = mjonReservMsgDAO.deleteIHeartMsgSeqListByMsgSeq(mjonResvMsgVO);
...	...	@@ -798,8 +808,14 @@
798	808	//제이제이 딜레이문자 즉시발송 처리
799	809	IVTResult = mjonReservMsgDAO.updateRealTimeIVTMsgSeqListByMsgSeq(mjonResvMsgVO);
800	810
	811	+ //제이제이 B01 딜레이문자 즉시발송 처리
	812	+ JJB01Result = mjonReservMsgDAO.updateRealTimeJJB01MsgSeqListByMsgSeq(mjonResvMsgVO);
	813	+
	814	+ //제이제이 B02 딜레이문자 즉시발송 처리
	815	+ JJB02Result = mjonReservMsgDAO.updateRealTimeJJB02MsgSeqListByMsgSeq(mjonResvMsgVO);
	816	+
801	817	//삭제 결과 합산
802		- resultSts = ihResult + FHSmsResult + FHMmsResult + imoResult +bizResult + JJResult + IVTResult;
	818	+ resultSts = ihResult + FHSmsResult + FHMmsResult + imoResult +bizResult + JJResult + IVTResult + JJB01Result + JJB02Result;
803	819
804	820	System.out.println("++++++++++++++++++++++++++++++ resultSts ::: "+resultSts);
805	821

...	...	@@ -109,6 +109,8 @@
109	109	int ivtResult = 0;
110	110	int FHSmsResult = 0;
111	111	int FHMmsResult = 0;
	112	+ int jjB01Result = 0;
	113	+ int jjB02Result = 0;
112	114
113	115	//아이하트 예약취소 삭제
114	116	ihResult = mjonReservMsgDAO.deleteIHeartMsgSeqListByMsgSeq(mjonResvMsgVO);
...	...	@@ -131,8 +133,14 @@
131	133	//인비토 예약취소 삭제
132	134	ivtResult = mjonReservMsgDAO.deleteIVTMsgSeqListByMsgSeq(mjonResvMsgVO);
133	135
	136	+ //제이제이 B01 예약취소 삭제
	137	+ jjB01Result = mjonReservMsgDAO.deleteJJB01MsgSeqListByMsgSeq(mjonResvMsgVO);
	138	+
	139	+ //제이제이 B02 예약취소 삭제
	140	+ jjB02Result = mjonReservMsgDAO.deleteJJB02MsgSeqListByMsgSeq(mjonResvMsgVO);
	141	+
134	142	//삭제 결과 합산
135		- result = ihResult + FHSmsResult + FHMmsResult + imoResult + bizResult +jjResult + ivtResult;
	143	+ result = ihResult + FHSmsResult + FHMmsResult + imoResult + bizResult +jjResult + ivtResult + jjB01Result + jjB02Result;
136	144
137	145	//각 전송사별 문자 발송 테이블에서 데이터 삭제 처리
138	146	/*if(agentCode.equals("01")) { //아이하트 메세지 삭제

Delete comment