tolag3/mjon_git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

문자발송 페이지 수정중

Browse Source
This commit is contained in:
hehihoho3@gmail.com 2024-12-18 18:31:24 +09:00
parent 1789876703
commit 150b8922e5
3 changed files with 112 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml
View File

@ -4275,63 +4275,60 @@
<select id="MjonMsgDataDAO.selectMsgSentFailListOneByDay" resultClass="mjonMsgVO">
/*MjonMsgDataDAO.selectMsgSentFailListOneByDay*/
SELECT MMD.USER_ID AS userId
, MMD.MSG_GROUP_ID AS msgGroupId
, MMD.MSG_SEQ AS msgSeq
, MMD.USERDATA AS userData
, MMD.REFUND_YN AS refundYn
, MMD.RSLT_CODE AS rsltCode
, MMD.RSLT_CODE2 AS rsltCode2
, MMD.AGENT_CODE AS agentCode
, DATE_FORMAT(MMD.SENT_DATE,'%Y-%m-%d %T') AS sentDate
, DATE_FORMAT(MMD.RSLT_DATE,'%Y-%m-%d %T') AS rsltDate
, MGD.EACH_PRICE AS eachPrice
FROM MJ_MSG_DATA MMD
INNER JOIN LETTNGNRLMBER MB
ON MMD.USER_ID = MB.MBER_ID
LEFT JOIN MJ_MSG_GROUP_DATA MGD
ON MMD.MSG_GROUP_ID = MGD.MSG_GROUP_ID
LEFT JOIN MJ_CASH MC
ON MC.ORDER_ID = MMD.USERDATA
AND MC.USER_ID = MMD.USER_ID
WHERE 1=1
AND MMD.SENT_DATE > date_add(now(), interval -40 day)
AND MMD.CUR_STATE = '3'
AND MMD.REFUND_YN = 'N'
AND MMD.RESERVE_C_YN = 'N'
AND MMD.MSG_TYPE IN ('4','6')
AND MMD.USER_ID NOT IN ('hftest', 'itntest', 'imotest', 'itntestBatch')
AND MGD.EACH_PRICE != 0
AND MC.ORDER_ID IS NULL
AND
(CASE
WHEN MMD.AGENT_CODE = '01' AND ( MMD.RSLT_CODE = '100' AND (MMD.RSLT_CODE2 = '0'))
THEN 'S'
WHEN MMD.AGENT_CODE = '02' AND (MMD.RSLT_CODE = '0')
THEN 'S'
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')
THEN 'S'
WHEN MMD.AGENT_CODE = '04' AND (MMD.RSLT_CODE = '4100' OR MMD.RSLT_CODE = '6600')
THEN 'S'
WHEN MMD.AGENT_CODE = '05' AND (MMD.RSLT_CODE = '1000' OR MMD.RSLT_CODE = '1001')
THEN 'S'
WHEN MMD.AGENT_CODE = '07' AND (MMD.RSLT_CODE = '6' OR MMD.RSLT_CODE = '1000')
THEN 'S'
WHEN MMD.AGENT_CODE = '08' AND (MMD.RSLT_CODE = '1000' OR MMD.RSLT_CODE = '1001')
THEN 'S'
WHEN MMD.AGENT_CODE = '09' AND (MMD.RSLT_CODE = '1000' OR MMD.RSLT_CODE = '1001')
THEN 'S'
WHEN (
MMD.RSLT_CODE IS NULL
AND MMD.RSLT_CODE2 IS NULL
AND MMD.SENT_DATE IS NULL
AND MMD.RSLT_DATE IS NULL
)
THEN 'W'
ELSE 'F'
END) IN ('F')
ORDER BY MMD.USER_ID
LIMIT 10000
SELECT MMD.USER_ID AS userId
, MMD.MSG_GROUP_ID AS msgGroupId
, MMD.MSG_SEQ AS msgSeq
, MMD.USERDATA AS userData
, MMD.REFUND_YN AS refundYn
, MMD.RSLT_CODE AS rsltCode
, MMD.RSLT_CODE2 AS rsltCode2
, MMD.AGENT_CODE AS agentCode
, DATE_FORMAT(MMD.SENT_DATE,'%Y-%m-%d %T') AS sentDate
, DATE_FORMAT(MMD.RSLT_DATE,'%Y-%m-%d %T') AS rsltDate
, MGD.EACH_PRICE AS eachPrice
FROM MJ_MSG_DATA MMD
INNER JOIN LETTNGNRLMBER MB
ON MMD.USER_ID = MB.MBER_ID
LEFT JOIN MJ_MSG_GROUP_DATA MGD
ON MMD.MSG_GROUP_ID = MGD.MSG_GROUP_ID
WHERE 1=1
AND MMD.SENT_DATE > date_add(now(), interval -40 day)
AND MMD.CUR_STATE = '3'
AND MMD.REFUND_YN = 'N'
AND MMD.RESERVE_C_YN = 'N'
AND MMD.MSG_TYPE IN ('4','6')
AND MMD.USER_ID NOT IN ('hftest', 'itntest', 'imotest', 'itntestBatch')
AND MGD.EACH_PRICE != 0
AND
(CASE
WHEN MMD.AGENT_CODE = '01' AND ( MMD.RSLT_CODE = '100' AND (MMD.RSLT_CODE2 = '0'))
THEN 'S'
WHEN MMD.AGENT_CODE = '02' AND (MMD.RSLT_CODE = '0')
THEN 'S'
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')
THEN 'S'
WHEN MMD.AGENT_CODE = '04' AND (MMD.RSLT_CODE = '4100' OR MMD.RSLT_CODE = '6600')
THEN 'S'
WHEN MMD.AGENT_CODE = '05' AND (MMD.RSLT_CODE = '1000' OR MMD.RSLT_CODE = '1001')
THEN 'S'
WHEN MMD.AGENT_CODE = '07' AND (MMD.RSLT_CODE = '6' OR MMD.RSLT_CODE = '1000')
THEN 'S'
WHEN MMD.AGENT_CODE = '08' AND (MMD.RSLT_CODE = '1000' OR MMD.RSLT_CODE = '1001')
THEN 'S'
WHEN MMD.AGENT_CODE = '09' AND (MMD.RSLT_CODE = '1000' OR MMD.RSLT_CODE = '1001')
THEN 'S'
WHEN (
MMD.RSLT_CODE IS NULL
AND MMD.RSLT_CODE2 IS NULL
AND MMD.SENT_DATE IS NULL
AND MMD.RSLT_DATE IS NULL
)
THEN 'W'
ELSE 'F'
END) IN ('F')
ORDER BY MMD.USER_ID
LIMIT 10000
</select>

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

@ -19,11 +19,11 @@
$(document).ready(function(){
console.log(' + $(#tabDision).val() : ',$('#tabDision').val())
if($('#tabDision').val() == 'tab02'){
$('#send_adYnY').prop('checked', true); // 상태 변경 및 이벤트 발생
advMsgInsert();
}
// console.log(' + $(#tabDision).val() : ',$('#tabDision').val())
// if($('#tabDision').val() == 'tab02'){
// $('#send_adYnY').prop('checked', true); // 상태 변경 및 이벤트 발생
// advMsgInsert();
// }
//받는사람 연락처 내용 처리
//Tabulator AJAX Data Loading
@ -737,7 +737,7 @@ $(document).ready(function (){
if(blineCodeYn != 'N' && blineCodeYn != ''){
$('input[name="send_adYn"]').val(['Y']);
$(".send_adYnN").css('display', 'none');
advMsgInsert();
// advMsgInsert();
}
//미리보기 이미지 영역 숨김 처리
@ -751,7 +751,7 @@ $(document).ready(function (){
//일반문자, 광고문자 텍스트 내용 추가해주기
$('input[name=send_adYn]').change(function(){
advMsgInsert();
// advMsgInsert();
});
@ -766,7 +766,7 @@ $(document).ready(function (){
var contents = $(this).val();
var adrYn = $("input[name=send_adYn]:checked").val();
if(adrYn == 'N'){
/* if(adrYn == 'N'){
if((contents.indexOf("(광고)") > -1 && (contents.indexOf("무료거부") > -1 || contents.indexOf("무료 거부") > -1))
|| contents.indexOf("(광고)") > -1){
@ -783,10 +783,10 @@ $(document).ready(function (){
}else{
fnByteString(contents);
}
} */
fnByteString(contents);
});//문자 바이트수 계산하기 끝
@ -2062,7 +2062,9 @@ $(document).ready(function (){
});
});
function advMsgInsert(){
/*
*
function advMsgInsert(){
var advStr = '<div class="ad_txt"><p>(광고)</p></div>';
var advDenyStr = '<div class="deny_txt"><p>무료거부 0808800858</p> </div>';
@ -2099,14 +2101,14 @@ function advMsgInsert(){
//문자 바이트수 계산하기
fnByteString($('#smsTxtArea').val());
}
} */
//문자 바이트수 계산하기 함수
function fnByteString(contents){
console.log(' : fnByteString : ');
var totalByte = 0;
//var content = contents;
var adverYn = $("input[name='send_adYn']:checked").val();
var adverYn = $('#adverYn').val();
var adTxtLeng = 0;
var denyTxtLeng = 0;
var adverTxt = $('.ad_txt').html();
@ -3237,7 +3239,7 @@ function fnTestSend(){
var loginVO = '${LoginVO}';
var spamStatus = false;
var callFrom = $("#callFromList option:selected").val();
var adverYn = $("input[name='send_adYn']:checked").val(); //광고 체크여부
var adverYn = $('#adverYn').val(); //광고 체크여부
//로그인 체크
if(loginVO == "" || loginVO == null){
@ -3890,6 +3892,8 @@ function getMjMsgSentListAll(pageNo) {
<input type="hidden" id="tabDision" value="<c:out value="${tabDision}"/>"/>
<input type="hidden" id="send_adYn" name="send_adYn" value="${tabDision eq 'tab02' ? 'Y' : 'N'}"/>
<!-- <div class="top_content current" id="tab1_1"> -->
<div class="heading">
<h2>
@ -3917,7 +3921,7 @@ function getMjMsgSentListAll(pageNo) {
<col style="width: auto;">
</colgroup>
<tbody>
<tr>
<!-- <tr>
<th scope="row">문자분류</th>
<td class="send_cf">
<input class="send_adYnN" id="send_adYnN" type="radio"name="send_adYn" value="N" checked="checked">
@ -3925,7 +3929,7 @@ function getMjMsgSentListAll(pageNo) {
<input id="send_adYnY" type="radio" name="send_adYn" value="Y">
<label for="send_adYnY">광고</label>
</td>
</tr>
</tr> -->
<tr>
<th scope="row">발신번호</th>
<td class="put_num">
@ -3972,14 +3976,30 @@ function getMjMsgSentListAll(pageNo) {
<ul class="thumb_wrap liOnImg"></ul>
<!-- //업로드한 이미지의 썸네일 영역 -->
<label for="smsTxtArea" class="label"></label>
<c:if test="${tabDision eq 'tab02'}">
<div class="ad_txt"><p>(광고)</p></div>
</c:if>
<textarea id="smsTxtArea" name="smsTxtArea" class="put_text"></textarea>
<div class="text_length">
<c:if test="${tabDision eq 'tab02'}">
<div class="deny_txt"><p>무료거부 0808800858</p> </div>
</c:if>
<div name="afterDeny">
<p>
<span class="fwMd" id="msgLeng">0 /</span>
<span class="c_002c9a fwMd" id="limitLeng"> 90</span>byte
</p>
<span class="msg_com msg_short">단문</span>
<p>
<span class="fwMd" id="msgLeng">
<c:choose>
<c:when test="${tabDision eq 'tab02'}">
27
</c:when>
<c:otherwise>
0
</c:otherwise>
</c:choose> /
</span>
<span class="c_002c9a fwMd" id="limitLeng"> 90</span>byte
</p>
<span class="msg_com msg_short">단문</span>
</div>
</div>
</div>
@ -4309,8 +4329,18 @@ function getMjMsgSentListAll(pageNo) {
<div class="text_preview">
<div class="preiew_img preViewShort"></div>
<div class="preview_auto">
<p class="none_txt">내용을 입력해주세요.</p>
<pre class="realtime"></pre>
<c:choose>
<c:when test="${tabDision eq 'tab02'}">
<p class="ad_tit">(광고)</p>
<p class="none_txt"></p>
<pre class="realtime"></pre>
<p class="deny_receipt">무료거부 0808800858</p>
</c:when>
<c:otherwise>
<p class="none_txt">내용을 입력해주세요.</p>
<pre class="realtime"></pre>
</c:otherwise>
</c:choose>
</div>
</div>
<!-- //텍스트 미리보기 -->

6
src/main/webapp/js/web/msgdata/msgDataView.js
View File

@ -737,7 +737,8 @@ function fn_saveMyMsg(){ // 내 문자 보관함 저장
var form = document.msgForm;
var myImgFileId = []; //신규 이미지 추가 파일 Id 저장 변수
var adverYn = $("input[name='send_adYn']:checked").val(); //광고 체크여부
// var adverYn = $("input[name='send_adYn']:checked").val(); //광고 체크여부
var adverYn = $('#adverYn').val(); //광고 체크여부
/*
이미지 에디터를 사용하여 추가한 경우 이미지 업로드 처리 - 단 에디터에서 템플릿을 선택한 경우는 업로드안함
@ -1132,7 +1133,8 @@ function fn_sendMsgData(){
form.callFrom.value = removeDash($('#callFromList').val()); // 발신번호 대쉬(-) 문자 없애주기
//광고 종류 설정
var adverYn = $("input[name='send_adYn']:checked").val();
// var adverYn = $("input[name='send_adYn']:checked").val();
var adverYn = $('#adverYn').val();
if(adverYn == 'Y'){
form.msgKind.value = "A"; //광고문자 종류 설정
}else{