--- src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml
+++ src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml
... | ... | @@ -4275,63 +4275,60 @@ |
| 4275 | 4275 |
<select id="MjonMsgDataDAO.selectMsgSentFailListOneByDay" resultClass="mjonMsgVO"> |
| 4276 | 4276 |
/*MjonMsgDataDAO.selectMsgSentFailListOneByDay*/ |
| 4277 | 4277 |
|
| 4278 |
- SELECT MMD.USER_ID AS userId |
|
| 4279 |
- , MMD.MSG_GROUP_ID AS msgGroupId |
|
| 4280 |
- , MMD.MSG_SEQ AS msgSeq |
|
| 4281 |
- , MMD.USERDATA AS userData |
|
| 4282 |
- , MMD.REFUND_YN AS refundYn |
|
| 4283 |
- , MMD.RSLT_CODE AS rsltCode |
|
| 4284 |
- , MMD.RSLT_CODE2 AS rsltCode2 |
|
| 4285 |
- , MMD.AGENT_CODE AS agentCode |
|
| 4286 |
- , DATE_FORMAT(MMD.SENT_DATE,'%Y-%m-%d %T') AS sentDate |
|
| 4287 |
- , DATE_FORMAT(MMD.RSLT_DATE,'%Y-%m-%d %T') AS rsltDate |
|
| 4288 |
- , MGD.EACH_PRICE AS eachPrice |
|
| 4289 |
- FROM MJ_MSG_DATA MMD |
|
| 4290 |
- INNER JOIN LETTNGNRLMBER MB |
|
| 4291 |
- ON MMD.USER_ID = MB.MBER_ID |
|
| 4292 |
- LEFT JOIN MJ_MSG_GROUP_DATA MGD |
|
| 4293 |
- ON MMD.MSG_GROUP_ID = MGD.MSG_GROUP_ID |
|
| 4294 |
- LEFT JOIN MJ_CASH MC |
|
| 4295 |
- ON MC.ORDER_ID = MMD.USERDATA |
|
| 4296 |
- AND MC.USER_ID = MMD.USER_ID |
|
| 4297 |
- WHERE 1=1 |
|
| 4298 |
- AND MMD.SENT_DATE > date_add(now(), interval -40 day) |
|
| 4299 |
- AND MMD.CUR_STATE = '3' |
|
| 4300 |
- AND MMD.REFUND_YN = 'N' |
|
| 4301 |
- AND MMD.RESERVE_C_YN = 'N' |
|
| 4302 |
- AND MMD.MSG_TYPE IN ('4','6')
|
|
| 4303 |
- AND MMD.USER_ID NOT IN ('hftest', 'itntest', 'imotest', 'itntestBatch')
|
|
| 4304 |
- AND MGD.EACH_PRICE != 0 |
|
| 4305 |
- AND MC.ORDER_ID IS NULL |
|
| 4306 |
- AND |
|
| 4307 |
- (CASE |
|
| 4308 |
- WHEN MMD.AGENT_CODE = '01' AND ( MMD.RSLT_CODE = '100' AND (MMD.RSLT_CODE2 = '0')) |
|
| 4309 |
- THEN 'S' |
|
| 4310 |
- WHEN MMD.AGENT_CODE = '02' AND (MMD.RSLT_CODE = '0') |
|
| 4311 |
- THEN 'S' |
|
| 4312 |
- WHEN MMD.AGENT_CODE = '03' AND (MMD.RSLT_CODE = '100' OR MMD.RSLT_CODE = '101' OR MMD.RSLT_CODE = '110' OR MMD.RSLT_CODE = '800') |
|
| 4313 |
- THEN 'S' |
|
| 4314 |
- WHEN MMD.AGENT_CODE = '04' AND (MMD.RSLT_CODE = '4100' OR MMD.RSLT_CODE = '6600') |
|
| 4315 |
- THEN 'S' |
|
| 4316 |
- WHEN MMD.AGENT_CODE = '05' AND (MMD.RSLT_CODE = '1000' OR MMD.RSLT_CODE = '1001') |
|
| 4317 |
- THEN 'S' |
|
| 4318 |
- WHEN MMD.AGENT_CODE = '07' AND (MMD.RSLT_CODE = '6' OR MMD.RSLT_CODE = '1000') |
|
| 4319 |
- THEN 'S' |
|
| 4320 |
- WHEN MMD.AGENT_CODE = '08' AND (MMD.RSLT_CODE = '1000' OR MMD.RSLT_CODE = '1001') |
|
| 4321 |
- THEN 'S' |
|
| 4322 |
- WHEN MMD.AGENT_CODE = '09' AND (MMD.RSLT_CODE = '1000' OR MMD.RSLT_CODE = '1001') |
|
| 4323 |
- THEN 'S' |
|
| 4324 |
- WHEN ( |
|
| 4325 |
- MMD.RSLT_CODE IS NULL |
|
| 4326 |
- AND MMD.RSLT_CODE2 IS NULL |
|
| 4327 |
- AND MMD.SENT_DATE IS NULL |
|
| 4328 |
- AND MMD.RSLT_DATE IS NULL |
|
| 4329 |
- ) |
|
| 4330 |
- THEN 'W' |
|
| 4331 |
- ELSE 'F' |
|
| 4332 |
- END) IN ('F')
|
|
| 4333 |
- ORDER BY MMD.USER_ID |
|
| 4334 |
- LIMIT 10000 |
|
| 4278 |
+ SELECT MMD.USER_ID AS userId |
|
| 4279 |
+ , MMD.MSG_GROUP_ID AS msgGroupId |
|
| 4280 |
+ , MMD.MSG_SEQ AS msgSeq |
|
| 4281 |
+ , MMD.USERDATA AS userData |
|
| 4282 |
+ , MMD.REFUND_YN AS refundYn |
|
| 4283 |
+ , MMD.RSLT_CODE AS rsltCode |
|
| 4284 |
+ , MMD.RSLT_CODE2 AS rsltCode2 |
|
| 4285 |
+ , MMD.AGENT_CODE AS agentCode |
|
| 4286 |
+ , DATE_FORMAT(MMD.SENT_DATE,'%Y-%m-%d %T') AS sentDate |
|
| 4287 |
+ , DATE_FORMAT(MMD.RSLT_DATE,'%Y-%m-%d %T') AS rsltDate |
|
| 4288 |
+ , MGD.EACH_PRICE AS eachPrice |
|
| 4289 |
+ FROM MJ_MSG_DATA MMD |
|
| 4290 |
+ INNER JOIN LETTNGNRLMBER MB |
|
| 4291 |
+ ON MMD.USER_ID = MB.MBER_ID |
|
| 4292 |
+ LEFT JOIN MJ_MSG_GROUP_DATA MGD |
|
| 4293 |
+ ON MMD.MSG_GROUP_ID = MGD.MSG_GROUP_ID |
|
| 4294 |
+ WHERE 1=1 |
|
| 4295 |
+ AND MMD.SENT_DATE > date_add(now(), interval -40 day) |
|
| 4296 |
+ AND MMD.CUR_STATE = '3' |
|
| 4297 |
+ AND MMD.REFUND_YN = 'N' |
|
| 4298 |
+ AND MMD.RESERVE_C_YN = 'N' |
|
| 4299 |
+ AND MMD.MSG_TYPE IN ('4','6')
|
|
| 4300 |
+ AND MMD.USER_ID NOT IN ('hftest', 'itntest', 'imotest', 'itntestBatch')
|
|
| 4301 |
+ AND MGD.EACH_PRICE != 0 |
|
| 4302 |
+ AND |
|
| 4303 |
+ (CASE |
|
| 4304 |
+ WHEN MMD.AGENT_CODE = '01' AND ( MMD.RSLT_CODE = '100' AND (MMD.RSLT_CODE2 = '0')) |
|
| 4305 |
+ THEN 'S' |
|
| 4306 |
+ WHEN MMD.AGENT_CODE = '02' AND (MMD.RSLT_CODE = '0') |
|
| 4307 |
+ THEN 'S' |
|
| 4308 |
+ WHEN MMD.AGENT_CODE = '03' AND (MMD.RSLT_CODE = '100' OR MMD.RSLT_CODE = '101' OR MMD.RSLT_CODE = '110' OR MMD.RSLT_CODE = '800') |
|
| 4309 |
+ THEN 'S' |
|
| 4310 |
+ WHEN MMD.AGENT_CODE = '04' AND (MMD.RSLT_CODE = '4100' OR MMD.RSLT_CODE = '6600') |
|
| 4311 |
+ THEN 'S' |
|
| 4312 |
+ WHEN MMD.AGENT_CODE = '05' AND (MMD.RSLT_CODE = '1000' OR MMD.RSLT_CODE = '1001') |
|
| 4313 |
+ THEN 'S' |
|
| 4314 |
+ WHEN MMD.AGENT_CODE = '07' AND (MMD.RSLT_CODE = '6' OR MMD.RSLT_CODE = '1000') |
|
| 4315 |
+ THEN 'S' |
|
| 4316 |
+ WHEN MMD.AGENT_CODE = '08' AND (MMD.RSLT_CODE = '1000' OR MMD.RSLT_CODE = '1001') |
|
| 4317 |
+ THEN 'S' |
|
| 4318 |
+ WHEN MMD.AGENT_CODE = '09' AND (MMD.RSLT_CODE = '1000' OR MMD.RSLT_CODE = '1001') |
|
| 4319 |
+ THEN 'S' |
|
| 4320 |
+ WHEN ( |
|
| 4321 |
+ MMD.RSLT_CODE IS NULL |
|
| 4322 |
+ AND MMD.RSLT_CODE2 IS NULL |
|
| 4323 |
+ AND MMD.SENT_DATE IS NULL |
|
| 4324 |
+ AND MMD.RSLT_DATE IS NULL |
|
| 4325 |
+ ) |
|
| 4326 |
+ THEN 'W' |
|
| 4327 |
+ ELSE 'F' |
|
| 4328 |
+ END) IN ('F')
|
|
| 4329 |
+ ORDER BY MMD.USER_ID |
|
| 4330 |
+ LIMIT 10000 |
|
| 4331 |
+ |
|
| 4335 | 4332 |
|
| 4336 | 4333 |
</select> |
| 4337 | 4334 |
|
--- src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
+++ src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
... | ... | @@ -19,11 +19,11 @@ |
| 19 | 19 |
$(document).ready(function(){
|
| 20 | 20 |
|
| 21 | 21 |
|
| 22 |
- console.log(' + $(#tabDision).val() : ',$('#tabDision').val())
|
|
| 23 |
- if($('#tabDision').val() == 'tab02'){
|
|
| 24 |
- $('#send_adYnY').prop('checked', true); // 상태 변경 및 이벤트 발생
|
|
| 25 |
- advMsgInsert(); |
|
| 26 |
- } |
|
| 22 |
+// console.log(' + $(#tabDision).val() : ',$('#tabDision').val())
|
|
| 23 |
+// if($('#tabDision').val() == 'tab02'){
|
|
| 24 |
+// $('#send_adYnY').prop('checked', true); // 상태 변경 및 이벤트 발생
|
|
| 25 |
+// advMsgInsert(); |
|
| 26 |
+// } |
|
| 27 | 27 |
|
| 28 | 28 |
//받는사람 연락처 내용 처리 |
| 29 | 29 |
//Tabulator AJAX Data Loading |
... | ... | @@ -737,7 +737,7 @@ |
| 737 | 737 |
if(blineCodeYn != 'N' && blineCodeYn != ''){
|
| 738 | 738 |
$('input[name="send_adYn"]').val(['Y']);
|
| 739 | 739 |
$(".send_adYnN").css('display', 'none');
|
| 740 |
- advMsgInsert(); |
|
| 740 |
+// advMsgInsert(); |
|
| 741 | 741 |
} |
| 742 | 742 |
|
| 743 | 743 |
//미리보기 이미지 영역 숨김 처리 |
... | ... | @@ -751,7 +751,7 @@ |
| 751 | 751 |
//일반문자, 광고문자 텍스트 내용 추가해주기 |
| 752 | 752 |
$('input[name=send_adYn]').change(function(){
|
| 753 | 753 |
|
| 754 |
- advMsgInsert(); |
|
| 754 |
+// advMsgInsert(); |
|
| 755 | 755 |
|
| 756 | 756 |
}); |
| 757 | 757 |
|
... | ... | @@ -766,7 +766,7 @@ |
| 766 | 766 |
var contents = $(this).val(); |
| 767 | 767 |
var adrYn = $("input[name=send_adYn]:checked").val();
|
| 768 | 768 |
|
| 769 |
- if(adrYn == 'N'){
|
|
| 769 |
+ /* if(adrYn == 'N'){
|
|
| 770 | 770 |
|
| 771 | 771 |
if((contents.indexOf("(광고)") > -1 && (contents.indexOf("무료거부") > -1 || contents.indexOf("무료 거부") > -1))
|
| 772 | 772 |
|| contents.indexOf("(광고)") > -1){
|
... | ... | @@ -783,10 +783,10 @@ |
| 783 | 783 |
|
| 784 | 784 |
}else{
|
| 785 | 785 |
|
| 786 |
- fnByteString(contents); |
|
| 787 | 786 |
|
| 788 |
- } |
|
| 789 |
- |
|
| 787 |
+ } */ |
|
| 788 |
+ |
|
| 789 |
+ fnByteString(contents); |
|
| 790 | 790 |
});//문자 바이트수 계산하기 끝 |
| 791 | 791 |
|
| 792 | 792 |
|
... | ... | @@ -2062,7 +2062,9 @@ |
| 2062 | 2062 |
}); |
| 2063 | 2063 |
}); |
| 2064 | 2064 |
|
| 2065 |
-function advMsgInsert(){
|
|
| 2065 |
+/* |
|
| 2066 |
+ * |
|
| 2067 |
+ function advMsgInsert(){
|
|
| 2066 | 2068 |
|
| 2067 | 2069 |
var advStr = '<div class="ad_txt"><p>(광고)</p></div>'; |
| 2068 | 2070 |
var advDenyStr = '<div class="deny_txt"><p>무료거부 0808800858</p> </div>'; |
... | ... | @@ -2099,14 +2101,14 @@ |
| 2099 | 2101 |
//문자 바이트수 계산하기 |
| 2100 | 2102 |
fnByteString($('#smsTxtArea').val());
|
| 2101 | 2103 |
|
| 2102 |
-} |
|
| 2104 |
+} */ |
|
| 2103 | 2105 |
|
| 2104 | 2106 |
//문자 바이트수 계산하기 함수 |
| 2105 | 2107 |
function fnByteString(contents){
|
| 2106 | 2108 |
console.log(' : fnByteString : ');
|
| 2107 | 2109 |
var totalByte = 0; |
| 2108 | 2110 |
//var content = contents; |
| 2109 |
- var adverYn = $("input[name='send_adYn']:checked").val();
|
|
| 2111 |
+ var adverYn = $('#adverYn').val();
|
|
| 2110 | 2112 |
var adTxtLeng = 0; |
| 2111 | 2113 |
var denyTxtLeng = 0; |
| 2112 | 2114 |
var adverTxt = $('.ad_txt').html();
|
... | ... | @@ -3237,7 +3239,7 @@ |
| 3237 | 3239 |
var loginVO = '${LoginVO}';
|
| 3238 | 3240 |
var spamStatus = false; |
| 3239 | 3241 |
var callFrom = $("#callFromList option:selected").val();
|
| 3240 |
- var adverYn = $("input[name='send_adYn']:checked").val(); //광고 체크여부
|
|
| 3242 |
+ var adverYn = $('#adverYn').val(); //광고 체크여부
|
|
| 3241 | 3243 |
|
| 3242 | 3244 |
//로그인 체크 |
| 3243 | 3245 |
if(loginVO == "" || loginVO == null){
|
... | ... | @@ -3890,6 +3892,8 @@ |
| 3890 | 3892 |
|
| 3891 | 3893 |
<input type="hidden" id="tabDision" value="<c:out value="${tabDision}"/>"/>
|
| 3892 | 3894 |
|
| 3895 |
+ <input type="hidden" id="send_adYn" name="send_adYn" value="${tabDision eq 'tab02' ? 'Y' : 'N'}"/>
|
|
| 3896 |
+ |
|
| 3893 | 3897 |
<!-- <div class="top_content current" id="tab1_1"> --> |
| 3894 | 3898 |
<div class="heading"> |
| 3895 | 3899 |
<h2> |
... | ... | @@ -3917,7 +3921,7 @@ |
| 3917 | 3921 |
<col style="width: auto;"> |
| 3918 | 3922 |
</colgroup> |
| 3919 | 3923 |
<tbody> |
| 3920 |
- <tr> |
|
| 3924 |
+ <!-- <tr> |
|
| 3921 | 3925 |
<th scope="row">문자분류</th> |
| 3922 | 3926 |
<td class="send_cf"> |
| 3923 | 3927 |
<input class="send_adYnN" id="send_adYnN" type="radio"name="send_adYn" value="N" checked="checked"> |
... | ... | @@ -3925,7 +3929,7 @@ |
| 3925 | 3929 |
<input id="send_adYnY" type="radio" name="send_adYn" value="Y"> |
| 3926 | 3930 |
<label for="send_adYnY">광고</label> |
| 3927 | 3931 |
</td> |
| 3928 |
- </tr> |
|
| 3932 |
+ </tr> --> |
|
| 3929 | 3933 |
<tr> |
| 3930 | 3934 |
<th scope="row">발신번호</th> |
| 3931 | 3935 |
<td class="put_num"> |
... | ... | @@ -3972,14 +3976,30 @@ |
| 3972 | 3976 |
<ul class="thumb_wrap liOnImg"></ul> |
| 3973 | 3977 |
<!-- //업로드한 이미지의 썸네일 영역 --> |
| 3974 | 3978 |
<label for="smsTxtArea" class="label"></label> |
| 3979 |
+ <c:if test="${tabDision eq 'tab02'}">
|
|
| 3980 |
+ <div class="ad_txt"><p>(광고)</p></div> |
|
| 3981 |
+ </c:if> |
|
| 3975 | 3982 |
<textarea id="smsTxtArea" name="smsTxtArea" class="put_text"></textarea> |
| 3976 | 3983 |
<div class="text_length"> |
| 3984 |
+ <c:if test="${tabDision eq 'tab02'}">
|
|
| 3985 |
+ <div class="deny_txt"><p>무료거부 0808800858</p> </div> |
|
| 3986 |
+ </c:if> |
|
| 3977 | 3987 |
<div name="afterDeny"> |
| 3978 |
- <p> |
|
| 3979 |
- <span class="fwMd" id="msgLeng">0 /</span> |
|
| 3980 |
- <span class="c_002c9a fwMd" id="limitLeng"> 90</span>byte |
|
| 3981 |
- </p> |
|
| 3982 |
- <span class="msg_com msg_short">단문</span> |
|
| 3988 |
+ <p> |
|
| 3989 |
+ <span class="fwMd" id="msgLeng"> |
|
| 3990 |
+ |
|
| 3991 |
+ <c:choose> |
|
| 3992 |
+ <c:when test="${tabDision eq 'tab02'}">
|
|
| 3993 |
+ 27 |
|
| 3994 |
+ </c:when> |
|
| 3995 |
+ <c:otherwise> |
|
| 3996 |
+ 0 |
|
| 3997 |
+ </c:otherwise> |
|
| 3998 |
+ </c:choose> / |
|
| 3999 |
+ </span> |
|
| 4000 |
+ <span class="c_002c9a fwMd" id="limitLeng"> 90</span>byte |
|
| 4001 |
+ </p> |
|
| 4002 |
+ <span class="msg_com msg_short">단문</span> |
|
| 3983 | 4003 |
</div> |
| 3984 | 4004 |
</div> |
| 3985 | 4005 |
</div> |
... | ... | @@ -4309,8 +4329,18 @@ |
| 4309 | 4329 |
<div class="text_preview"> |
| 4310 | 4330 |
<div class="preiew_img preViewShort"></div> |
| 4311 | 4331 |
<div class="preview_auto"> |
| 4312 |
- <p class="none_txt">내용을 입력해주세요.</p> |
|
| 4313 |
- <pre class="realtime"></pre> |
|
| 4332 |
+ <c:choose> |
|
| 4333 |
+ <c:when test="${tabDision eq 'tab02'}">
|
|
| 4334 |
+ <p class="ad_tit">(광고)</p> |
|
| 4335 |
+ <p class="none_txt"></p> |
|
| 4336 |
+ <pre class="realtime"></pre> |
|
| 4337 |
+ <p class="deny_receipt">무료거부 0808800858</p> |
|
| 4338 |
+ </c:when> |
|
| 4339 |
+ <c:otherwise> |
|
| 4340 |
+ <p class="none_txt">내용을 입력해주세요.</p> |
|
| 4341 |
+ <pre class="realtime"></pre> |
|
| 4342 |
+ </c:otherwise> |
|
| 4343 |
+ </c:choose> |
|
| 4314 | 4344 |
</div> |
| 4315 | 4345 |
</div> |
| 4316 | 4346 |
<!-- //텍스트 미리보기 --> |
--- src/main/webapp/js/web/msgdata/msgDataView.js
+++ src/main/webapp/js/web/msgdata/msgDataView.js
... | ... | @@ -737,7 +737,8 @@ |
| 737 | 737 |
|
| 738 | 738 |
var form = document.msgForm; |
| 739 | 739 |
var myImgFileId = []; //신규 이미지 추가 파일 Id 저장 변수 |
| 740 |
- var adverYn = $("input[name='send_adYn']:checked").val(); //광고 체크여부
|
|
| 740 |
+// var adverYn = $("input[name='send_adYn']:checked").val(); //광고 체크여부
|
|
| 741 |
+ var adverYn = $('#adverYn').val(); //광고 체크여부
|
|
| 741 | 742 |
|
| 742 | 743 |
/* |
| 743 | 744 |
이미지 에디터를 사용하여 추가한 경우 이미지 업로드 처리 - 단 에디터에서 템플릿을 선택한 경우는 업로드안함 |
... | ... | @@ -1132,7 +1133,8 @@ |
| 1132 | 1133 |
form.callFrom.value = removeDash($('#callFromList').val()); // 발신번호 대쉬(-) 문자 없애주기
|
| 1133 | 1134 |
|
| 1134 | 1135 |
//광고 종류 설정 |
| 1135 |
- var adverYn = $("input[name='send_adYn']:checked").val();
|
|
| 1136 |
+ // var adverYn = $("input[name='send_adYn']:checked").val();
|
|
| 1137 |
+ var adverYn = $('#adverYn').val();
|
|
| 1136 | 1138 |
if(adverYn == 'Y'){
|
| 1137 | 1139 |
form.msgKind.value = "A"; //광고문자 종류 설정 |
| 1138 | 1140 |
}else{
|
Add a comment
Delete comment
Once you delete this comment, you won't be able to recover it. Are you sure you want to delete this comment?