회원상세 알림톡목록 쿼리조건 수정
This commit is contained in:
itn
parent
06fe04fbde
commit
3bb1f11a5a
@ -1412,7 +1412,7 @@ public class EgovUserManageController {
|
||||
*/
|
||||
|
||||
KakaoVO sendKakaoVO = new KakaoVO();
|
||||
sendKakaoVO.setSearchCondition2("N");//예약건은 제외하기
|
||||
//sendKakaoVO.setSearchCondition2("N");//예약건은 제외하기
|
||||
sendKakaoVO.setReserveCYn("N");//예약취소건은 제외하기
|
||||
sendKakaoVO.setUserId(reqMberManageVO.getMberId());
|
||||
// 문자발송 완료건은 모두 보이도록 처리
|
||||
@ -1431,6 +1431,7 @@ public class EgovUserManageController {
|
||||
*/
|
||||
|
||||
KakaoVO reserveKakaoVO = new KakaoVO();
|
||||
reserveKakaoVO.setReserveYn("Y"); //예약건만 조회
|
||||
reserveKakaoVO.setSearchCondition2("Y");//예약건만 불러오기
|
||||
reserveKakaoVO.setReserveCYn("N");//예약취소건은 제외하기
|
||||
reserveKakaoVO.setUserId(reqMberManageVO.getMberId());
|
||||
|
||||
@ -439,7 +439,7 @@
|
||||
AGENT_CODE AS agentCode ,
|
||||
RESERVE_YN AS reserveYn ,
|
||||
RESERVE_C_YN AS reserveCYn ,
|
||||
CANCELDATE AS cancelDate ,
|
||||
DATE_FORMAT(CANCELDATE, '%Y-%m-%d %T') AS cancelDate ,
|
||||
msgTypeName AS msgTypeName ,
|
||||
orderByCode AS orderByCode ,
|
||||
RESULT AS msgResult ,
|
||||
@ -554,13 +554,13 @@
|
||||
</isEqual>
|
||||
|
||||
<isEqual property="searchCondition2" compareValue="" >
|
||||
AND M.RESERVE_YN IN ('Y','N')
|
||||
AND IFNULL(M.RESERVE_YN, 'N') IN ('Y','N')
|
||||
</isEqual>
|
||||
<isEqual property="searchCondition2" compareValue="N">
|
||||
AND M.RESERVE_YN = 'N'
|
||||
AND IFNULL(M.RESERVE_YN, 'N') = 'N'
|
||||
</isEqual>
|
||||
<isEqual property="searchCondition2" compareValue="Y">
|
||||
AND M.RESERVE_YN = 'Y'
|
||||
AND IFNULL(M.RESERVE_YN, 'N') = 'Y'
|
||||
</isEqual>
|
||||
</isNotEmpty>
|
||||
|
||||
@ -585,13 +585,13 @@
|
||||
</isNotEmpty>
|
||||
<isNotEmpty property="searchCondition2">
|
||||
<isEqual property="searchCondition2" compareValue="" >
|
||||
AND M.RESERVE_YN IN ('Y','N')
|
||||
AND IFNULL(M.RESERVE_YN, 'N') IN ('Y','N')
|
||||
</isEqual>
|
||||
<isEqual property="searchCondition2" compareValue="N">
|
||||
AND M.RESERVE_YN = 'N'
|
||||
AND IFNULL(M.RESERVE_YN, 'N') = 'N'
|
||||
</isEqual>
|
||||
<isEqual property="searchCondition2" compareValue="Y">
|
||||
AND M.RESERVE_YN = 'Y'
|
||||
AND IFNULL(M.RESERVE_YN, 'N') = 'Y'
|
||||
</isEqual>
|
||||
</isNotEmpty>
|
||||
</isEmpty>
|
||||
@ -1214,7 +1214,7 @@
|
||||
AGENT_CODE AS agentCode ,
|
||||
RESERVE_YN AS reserveYn ,
|
||||
RESERVE_C_YN AS reserveCYn ,
|
||||
CANCELDATE AS cancelDate ,
|
||||
DATE_FORMAT(CANCELDATE, '%Y-%m-%d %T') AS cancelDate ,
|
||||
msgTypeName AS msgTypeName ,
|
||||
orderByCode AS orderByCode ,
|
||||
RESULT AS msgResult ,
|
||||
@ -1227,7 +1227,7 @@
|
||||
BL.CALL_STATUS AS callStatus,
|
||||
M.BIZ_KAKAO_RESEND_YN AS bizKakaoResendYn,
|
||||
M.AT_DELAY_COMPLETE_YN AS atDelayCompleteYn,
|
||||
M.AT_DELAY_YN AS atDelayYn
|
||||
M.AT_DELAY_YN AS atDelayYn
|
||||
FROM (
|
||||
SELECT MG.USER_ID ,
|
||||
MG.MSG_GROUP_ID ,
|
||||
@ -1319,13 +1319,13 @@
|
||||
</isEqual>
|
||||
|
||||
<isEqual property="searchCondition2" compareValue="" >
|
||||
AND M.RESERVE_YN IN ('Y','N')
|
||||
AND IFNULL(M.RESERVE_YN, 'N') IN ('Y','N')
|
||||
</isEqual>
|
||||
<isEqual property="searchCondition2" compareValue="N">
|
||||
AND M.RESERVE_YN = 'N'
|
||||
AND IFNULL(M.RESERVE_YN, 'N') = 'N'
|
||||
</isEqual>
|
||||
<isEqual property="searchCondition2" compareValue="Y">
|
||||
AND M.RESERVE_YN = 'Y'
|
||||
AND IFNULL(M.RESERVE_YN, 'N') = 'Y'
|
||||
</isEqual>
|
||||
</isNotEmpty>
|
||||
|
||||
@ -1350,13 +1350,13 @@
|
||||
</isNotEmpty>
|
||||
<isNotEmpty property="searchCondition2">
|
||||
<isEqual property="searchCondition2" compareValue="" >
|
||||
AND M.RESERVE_YN IN ('Y','N')
|
||||
AND IFNULL(M.RESERVE_YN, 'N') IN ('Y','N')
|
||||
</isEqual>
|
||||
<isEqual property="searchCondition2" compareValue="N">
|
||||
AND M.RESERVE_YN = 'N'
|
||||
AND IFNULL(M.RESERVE_YN, 'N') = 'N'
|
||||
</isEqual>
|
||||
<isEqual property="searchCondition2" compareValue="Y">
|
||||
AND M.RESERVE_YN = 'Y'
|
||||
AND IFNULL(M.RESERVE_YN, 'N') = 'Y'
|
||||
</isEqual>
|
||||
</isNotEmpty>
|
||||
</isEmpty>
|
||||
@ -1364,7 +1364,7 @@
|
||||
<isNotEmpty property="pageType">
|
||||
<isEqual property="pageType" compareValue="sand">
|
||||
AND M.AT_DELAY_COMPLETE_YN ='Y'
|
||||
AND M.REFUND_YN = 'N'
|
||||
/*AND M.REFUND_YN = 'N'*/
|
||||
</isEqual>
|
||||
</isNotEmpty>
|
||||
|
||||
@ -1996,13 +1996,13 @@
|
||||
</isNotEmpty>
|
||||
<isNotEmpty property="searchCondition2">
|
||||
<isEqual property="searchCondition2" compareValue="" >
|
||||
AND M.RESERVE_YN IN ('Y','N')
|
||||
AND IFNULL(M.RESERVE_YN, 'N') IN ('Y','N')
|
||||
</isEqual>
|
||||
<isEqual property="searchCondition2" compareValue="N">
|
||||
AND M.RESERVE_YN = 'N'
|
||||
AND IFNULL(M.RESERVE_YN, 'N') = 'N'
|
||||
</isEqual>
|
||||
<isEqual property="searchCondition2" compareValue="Y">
|
||||
AND M.RESERVE_YN = 'Y'
|
||||
AND IFNULL(M.RESERVE_YN, 'N') = 'Y'
|
||||
</isEqual>
|
||||
</isNotEmpty>
|
||||
</isEmpty>
|
||||
|
||||
@ -3902,6 +3902,15 @@ function kakaoATDelayCancel(msgGroupId){
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<c:choose>
|
||||
<c:when test="${mjonMsgSentList.delayYn eq 'Y' && mjonMsgSentList.delayCompleteYn eq 'Y' && not empty mjonMsgSentList.cancelDate}">
|
||||
<span style="color: red;">
|
||||
<c:if test="${mjonMsgSentList.reserveYn eq 'Y'}">
|
||||
[예약]
|
||||
</c:if>
|
||||
[발송취소]<br />
|
||||
<fmt:formatDate value="${mjonMsgSentList.cancelDate}" pattern="MM-dd HH:mm"/>
|
||||
</span>
|
||||
</c:when>
|
||||
<c:when test="${mjonMsgSentList.reserveCYn eq 'Y'}">
|
||||
[예약취소]<br />
|
||||
<fmt:formatDate value="${mjonMsgSentList.cancelDate}" pattern="MM-dd HH:mm"/>
|
||||
@ -3910,12 +3919,6 @@ function kakaoATDelayCancel(msgGroupId){
|
||||
[예약]<br />
|
||||
<fmt:formatDate value="${mjonMsgSentList.reqdate}" pattern="MM-dd HH:mm"/>
|
||||
</c:when>
|
||||
<c:when test="${mjonMsgSentList.delayYn eq 'Y' && mjonMsgSentList.delayCompleteYn eq 'Y' && not empty mjonMsgSentList.cancelDate}">
|
||||
<span style="color: red;">
|
||||
[발송취소]<br />
|
||||
<fmt:formatDate value="${mjonMsgSentList.cancelDate}" pattern="MM-dd HH:mm"/>
|
||||
</span>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
-
|
||||
</c:otherwise>
|
||||
@ -4109,6 +4112,15 @@ function kakaoATDelayCancel(msgGroupId){
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<c:choose>
|
||||
<c:when test="${mjonMsgSentList.delayYn eq 'Y' && mjonMsgSentList.delayCompleteYn eq 'Y' && not empty mjonMsgSentList.cancelDate}">
|
||||
<span style="color: red;">
|
||||
<c:if test="${mjonMsgSentList.reserveYn eq 'Y'}">
|
||||
[예약]
|
||||
</c:if>
|
||||
[발송취소]<br />
|
||||
<fmt:formatDate value="${mjonMsgSentList.cancelDate}" pattern="yyyy-MM-dd HH:mm"/>
|
||||
</span>
|
||||
</c:when>
|
||||
<c:when test="${mjonMsgSentList.reserveCYn eq 'Y'}">
|
||||
[예약취소]<br />
|
||||
<fmt:formatDate value="${mjonMsgSentList.cancelDate}" pattern="yyyy-MM-dd HH:mm"/>
|
||||
@ -4117,12 +4129,6 @@ function kakaoATDelayCancel(msgGroupId){
|
||||
[예약]<br />
|
||||
<fmt:formatDate value="${mjonMsgSentList.reqdate}" pattern="yyyy-MM-dd HH:mm"/>
|
||||
</c:when>
|
||||
<c:when test="${mjonMsgSentList.delayYn eq 'Y' && mjonMsgSentList.delayCompleteYn eq 'Y' && not empty mjonMsgSentList.cancelDate}">
|
||||
<span style="color: red;">
|
||||
[발송취소]<br />
|
||||
<fmt:formatDate value="${mjonMsgSentList.cancelDate}" pattern="yyyy-MM-dd HH:mm"/>
|
||||
</span>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
-
|
||||
</c:otherwise>
|
||||
@ -4525,6 +4531,16 @@ function kakaoATDelayCancel(msgGroupId){
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<c:choose>
|
||||
<c:when test="${kakaoResultList.atDelayYn eq 'Y' && kakaoResultList.atDelayCompleteYn eq 'Y' && not empty kakaoResultList.cancelDate}">
|
||||
<span style="color: red;">
|
||||
<c:if test="${kakaoResultList.reserveYn eq 'Y'}">
|
||||
[예약]
|
||||
</c:if>
|
||||
[발송취소]<br />
|
||||
<fmt:parseDate value="${kakaoResultList.cancelDate}" var="cancelDateValue" pattern="yyyy-MM-dd HH:mm"/>
|
||||
<fmt:formatDate value="${cancelDateValue}" pattern="MM-dd HH:mm"/>
|
||||
</span>
|
||||
</c:when>
|
||||
<c:when test="${kakaoResultList.reserveCYn eq 'Y'}">
|
||||
[예약취소]<br />
|
||||
<fmt:parseDate value="${kakaoResultList.cancelDate}" var="dateValue" pattern="yyyy-MM-dd HH:mm:ss"/>
|
||||
@ -4652,6 +4668,13 @@ function kakaoATDelayCancel(msgGroupId){
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<c:choose>
|
||||
<c:when test="${kakaoReserveList.atDelayYn eq 'Y' && kakaoReserveList.atDelayCompleteYn eq 'Y' && not empty kakaoReserveList.cancelDate}">
|
||||
<span style="color: red;">
|
||||
[발송취소]<br />
|
||||
<fmt:parseDate value="${kakaoReserveList.cancelDate}" var="cancelDateValue" pattern="yyyy-MM-dd HH:mm"/>
|
||||
<fmt:formatDate value="${cancelDateValue}" pattern="MM-dd HH:mm"/>
|
||||
</span>
|
||||
</c:when>
|
||||
<c:when test="${kakaoReserveList.reserveCYn eq 'Y'}">
|
||||
[예약취소]<br />
|
||||
<fmt:parseDate value="${kakaoReserveList.cancelDate}" var="dateValue" pattern="yyyy-MM-dd HH:mm:ss"/>
|
||||
|
||||
@ -404,6 +404,7 @@ function msgDetailClose(obj){
|
||||
<col style="width: 10%">
|
||||
<col style="width: 10%">
|
||||
<col style="width: 10%">
|
||||
<col style="width: 10%">
|
||||
<col style="width: 8%">
|
||||
<col style="width: 20%">
|
||||
<col style="width: 7%">
|
||||
@ -414,6 +415,7 @@ function msgDetailClose(obj){
|
||||
<th>아이디</th>
|
||||
<th>채널ID</th>
|
||||
<th>발송건수</th>
|
||||
<th>스미싱의심</th>
|
||||
<th>요청시간</th>
|
||||
<th>예약</th>
|
||||
<th>내용</th>
|
||||
@ -457,6 +459,37 @@ function msgDetailClose(obj){
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</td>
|
||||
<td>
|
||||
<c:choose>
|
||||
<c:when test="${result.atDelayYn eq 'Y'}">
|
||||
<c:choose>
|
||||
<c:when test="${result.atDelayCompleteYn eq 'Y' && not empty result.cancelDate}">
|
||||
<span style="color: #0000FF;">
|
||||
<c:if test="${result.atSmishingYn eq 'Y'}">온</c:if>
|
||||
<c:if test="${result.atSmishingYn eq 'N'}">오프</c:if>[발송취소]
|
||||
<span style="overflow:hidden;text-overflow:ellipsis;white-space:nowrap;display:block;margin-top:3px;" title="<c:out value="${result.cancelDate}"/>">
|
||||
<fmt:parseDate value="${result.cancelDate}" var="cancelDateValue" pattern="yyyy-MM-dd HH:mm"/>
|
||||
<fmt:formatDate value="${cancelDateValue}" pattern="MM-dd HH:mm"/>
|
||||
</span>
|
||||
</span>
|
||||
</c:when>
|
||||
<c:when test="${result.atDelayCompleteYn eq 'N'}">
|
||||
<c:if test="${result.atSmishingYn eq 'Y'}">온</c:if>
|
||||
<c:if test="${result.atSmishingYn eq 'N'}">오프</c:if>[미처리]
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<span style="color: #0000FF;">
|
||||
<c:if test="${result.atSmishingYn eq 'Y'}">온</c:if>
|
||||
<c:if test="${result.atSmishingYn eq 'N'}">오프</c:if>[승인]
|
||||
</span>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
-
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</td>
|
||||
<td>
|
||||
<fmt:parseDate value="${result.reqDate}" var="reqDateValue" pattern="yyyy-MM-dd HH:mm"/>
|
||||
<fmt:formatDate value="${reqDateValue}" pattern="MM-dd HH:mm"/>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user