--- src/main/java/itn/let/mjo/msg/service/RefundDTO.java
+++ src/main/java/itn/let/mjo/msg/service/RefundDTO.java
... | ... | @@ -8,15 +8,13 @@ |
| 8 | 8 |
public class RefundDTO {
|
| 9 | 9 |
private String userId; |
| 10 | 10 |
private String msgGroupId; |
| 11 |
- private String userData; |
|
| 12 | 11 |
private int msgSeq; |
| 13 | 12 |
private String eachPrice ; // 전송문자 개별가격 |
| 14 | 13 |
|
| 15 |
- public RefundDTO(String userId, String msgGroupId, int msgSeq, String userData, String eachPrice) {
|
|
| 14 |
+ public RefundDTO(String userId, String msgGroupId, int msgSeq, String eachPrice) {
|
|
| 16 | 15 |
this.userId = userId; |
| 17 | 16 |
this.msgGroupId = msgGroupId; |
| 18 | 17 |
this.msgSeq = msgSeq; |
| 19 |
- this.userData = userData; |
|
| 20 | 18 |
this.eachPrice = eachPrice; |
| 21 | 19 |
} |
| 22 | 20 |
} |
--- src/main/java/itn/let/mjo/test/web/TestController.java
+++ src/main/java/itn/let/mjo/test/web/TestController.java
... | ... | @@ -3457,7 +3457,7 @@ |
| 3457 | 3457 |
|
| 3458 | 3458 |
// 필요한 필드만 DTO로 매핑 |
| 3459 | 3459 |
List<RefundDTO> dtoList = msgFailList.stream() |
| 3460 |
- .map(msg -> new RefundDTO(msg.getUserId(), msg.getMsgGroupId(), Integer.parseInt(msg.getUserData()), msg.getUserData(), msg.getEachPrice())) |
|
| 3460 |
+ .map(msg -> new RefundDTO(msg.getUserId(), msg.getMsgGroupId(), Integer.parseInt(msg.getUserData()), msg.getEachPrice())) |
|
| 3461 | 3461 |
.collect(Collectors.toList()); |
| 3462 | 3462 |
// JSON 변환 |
| 3463 | 3463 |
ObjectMapper objectMapper = new ObjectMapper(); |
--- src/main/java/itn/let/schdlr/service/impl/SchdlrManageServiceImpl.java
+++ src/main/java/itn/let/schdlr/service/impl/SchdlrManageServiceImpl.java
... | ... | @@ -521,7 +521,6 @@ |
| 521 | 521 |
msg.getUserId() |
| 522 | 522 |
, msg.getMsgGroupId() |
| 523 | 523 |
, Integer.parseInt(msg.getUserData()) |
| 524 |
- , msg.getUserData() |
|
| 525 | 524 |
, msg.getEachPrice()) |
| 526 | 525 |
) |
| 527 | 526 |
.collect(Collectors.toList()); |
--- src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp
+++ src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp
... | ... | @@ -1354,8 +1354,9 @@ |
| 1354 | 1354 |
<div class="header_body"> |
| 1355 | 1355 |
<div class="inner table"> |
| 1356 | 1356 |
<h1 class="logo"><a href="/web/main/mainPage.do" title="문자온 메인 바로가기"> |
| 1357 |
-<!-- <img src="/publish/images/CI.png" alt="단체문자 대량문자 발송 인터넷 웹문자 사이트 - 문자온"> --> |
|
| 1358 |
- ADVANCED 문자온</a></h1> |
|
| 1357 |
+ <img src="/publish/images/CI.png" alt="단체문자 대량문자 발송 인터넷 웹문자 사이트 - 문자온"> |
|
| 1358 |
+<!-- ADVANCED 문자온 --> |
|
| 1359 |
+ </a></h1> |
|
| 1359 | 1360 |
<ul class="gnbWrap table_cell"> |
| 1360 | 1361 |
<c:forEach var="resultListOne" items="${menuResultList}" varStatus="status">
|
| 1361 | 1362 |
<c:if test="${resultListOne.depth eq '1' }">
|
--- src/main/webapp/WEB-INF/jsp/web/fax/faxSentPrintListPopUp.jsp
+++ src/main/webapp/WEB-INF/jsp/web/fax/faxSentPrintListPopUp.jsp
... | ... | @@ -157,7 +157,7 @@ |
| 157 | 157 |
<c:set var="totPrice" value="${totPrice + totfailPrice}"/>
|
| 158 | 158 |
</p> |
| 159 | 159 |
</td> |
| 160 |
- </tr |
|
| 160 |
+ </tr> |
|
| 161 | 161 |
</tr> |
| 162 | 162 |
</c:forEach> |
| 163 | 163 |
<tr class="total_price"> |
--- src/main/webapp/WEB-INF/jsp/web/kakao/include/KaKaoAlimtalkTopMenuTap.jsp
+++ src/main/webapp/WEB-INF/jsp/web/kakao/include/KaKaoAlimtalkTopMenuTap.jsp
... | ... | @@ -142,10 +142,10 @@ |
| 142 | 142 |
|
| 143 | 143 |
<ul class="tabType4"> |
| 144 | 144 |
<li id="tabAt" class="tab topTab"><button type="button" onclick="javascript:fnLinkPageTopTab('tabAlim');">알림톡</button></li>
|
| 145 |
- <c:if test="${fn:contains(pageContext.request.requestURL , 'localhost')
|
|
| 146 |
- || fn:contains(pageContext.request.requestURL , '119.193.215.98')}"> |
|
| 147 |
- <li id="tabFt" class="tab topTab"><button type="button" onclick="javascript:fnLinkPageTopTab('tabFriend');">친구톡</button></li>
|
|
| 148 |
- </c:if> |
|
| 145 |
+<%-- <c:if test="${fn:contains(pageContext.request.requestURL , 'localhost') --%>
|
|
| 146 |
+<%-- || fn:contains(pageContext.request.requestURL , '119.193.215.98')}"> --%> |
|
| 147 |
+<!-- <li id="tabFt" class="tab topTab"><button type="button" onclick="javascript:fnLinkPageTopTab('tabFriend');">친구톡</button></li> -->
|
|
| 148 |
+<%-- </c:if> --%> |
|
| 149 | 149 |
<li id="tabConf" class="tab topTab"><button type="button" onclick="javascript:fnLinkPageTopTab('tabConf');">카카오톡 설정</button></li>
|
| 150 | 150 |
<li id="tabIntro" class="tab topTab"><button type="button" onclick="javascript:fnLinkPageTopTab('tabAlimtalkIntrd');">알림톡 소개</button></li>
|
| 151 | 151 |
</ul>(No newline at end of file) |
--- src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentView.jsp
+++ src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentView.jsp
... | ... | @@ -946,10 +946,10 @@ |
| 946 | 946 |
<ul class="list_tab"> |
| 947 | 947 |
<li class="tab active"><button type="button" onclick="fnTabLoad('',0); return false;">전체</button></li>
|
| 948 | 948 |
<li class="tab"><button type="button" onclick="fnTabLoad('at', 1); return false;">알림톡</button></li>
|
| 949 |
- <c:if test="${fn:contains(pageContext.request.requestURL , 'localhost')
|
|
| 950 |
- || fn:contains(pageContext.request.requestURL , '119.193.215.98')}"> |
|
| 951 |
- <li class="tab"><button type="button" onclick="fnTabLoad('ft', 2); return false;">친구톡</button></li>
|
|
| 952 |
- </c:if> |
|
| 949 |
+<%-- <c:if test="${fn:contains(pageContext.request.requestURL , 'localhost') --%>
|
|
| 950 |
+<%-- || fn:contains(pageContext.request.requestURL , '119.193.215.98')}"> --%> |
|
| 951 |
+<!-- <li class="tab"><button type="button" onclick="fnTabLoad('ft', 2); return false;">친구톡</button></li> -->
|
|
| 952 |
+<%-- </c:if> --%> |
|
| 953 | 953 |
</ul><!--// tab button --> |
| 954 | 954 |
</div> |
| 955 | 955 |
<!-- 예약관리 > 전체 --> |
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?