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-20 14:51:48 +09:00
parent 3c8e608ccf
commit a759a9f3f2
7 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/itn/let/mjo/msg/service/RefundDTO.java
View File

@ -8,15 +8,13 @@ import lombok.Setter;
public class RefundDTO { public class RefundDTO {
private String userId; private String userId;
private String msgGroupId; private String msgGroupId;
private String userData;
private int msgSeq; private int msgSeq;
private String eachPrice ; // 전송문자 개별가격 private String eachPrice ; // 전송문자 개별가격
public RefundDTO(String userId, String msgGroupId, int msgSeq, String userData, String eachPrice) { public RefundDTO(String userId, String msgGroupId, int msgSeq, String eachPrice) {
this.userId = userId; this.userId = userId;
this.msgGroupId = msgGroupId; this.msgGroupId = msgGroupId;
this.msgSeq = msgSeq; this.msgSeq = msgSeq;
this.userData = userData;
this.eachPrice = eachPrice; this.eachPrice = eachPrice;
} }
} }

2
src/main/java/itn/let/mjo/test/web/TestController.java
View File

@ -3457,7 +3457,7 @@ public class TestController {
// 필요한 필드만 DTO로 매핑 // 필요한 필드만 DTO로 매핑
List<RefundDTO> dtoList = msgFailList.stream() List<RefundDTO> dtoList = msgFailList.stream()
.map(msg -> new RefundDTO(msg.getUserId(), msg.getMsgGroupId(), Integer.parseInt(msg.getUserData()), msg.getUserData(), msg.getEachPrice())) .map(msg -> new RefundDTO(msg.getUserId(), msg.getMsgGroupId(), Integer.parseInt(msg.getUserData()), msg.getEachPrice()))
.collect(Collectors.toList()); .collect(Collectors.toList());
// JSON 변환 // JSON 변환
ObjectMapper objectMapper = new ObjectMapper(); ObjectMapper objectMapper = new ObjectMapper();

1
src/main/java/itn/let/schdlr/service/impl/SchdlrManageServiceImpl.java
View File

@ -521,7 +521,6 @@ public class SchdlrManageServiceImpl extends EgovAbstractServiceImpl implements
msg.getUserId() msg.getUserId()
, msg.getMsgGroupId() , msg.getMsgGroupId()
, Integer.parseInt(msg.getUserData()) , Integer.parseInt(msg.getUserData())
, msg.getUserData()
, msg.getEachPrice()) , msg.getEachPrice())
) )
.collect(Collectors.toList()); .collect(Collectors.toList());

5
src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp
View File

@ -1354,8 +1354,9 @@ function actionLogin() {
<div class="header_body"> <div class="header_body">
<div class="inner table"> <div class="inner table">
<h1 class="logo"><a href="/web/main/mainPage.do" title="문자온 메인 바로가기"> <h1 class="logo"><a href="/web/main/mainPage.do" title="문자온 메인 바로가기">
<!-- <img src="/publish/images/CI.png" alt="단체문자 대량문자 발송 인터넷 웹문자 사이트 - 문자온"> --> <img src="/publish/images/CI.png" alt="단체문자 대량문자 발송 인터넷 웹문자 사이트 - 문자온">
ADVANCED 문자온</a></h1> <!-- ADVANCED 문자온 -->
</a></h1>
<ul class="gnbWrap table_cell"> <ul class="gnbWrap table_cell">
<c:forEach var="resultListOne" items="${menuResultList}" varStatus="status"> <c:forEach var="resultListOne" items="${menuResultList}" varStatus="status">
<c:if test="${resultListOne.depth eq '1' }"> <c:if test="${resultListOne.depth eq '1' }">

2
src/main/webapp/WEB-INF/jsp/web/fax/faxSentPrintListPopUp.jsp
View File

@ -157,7 +157,7 @@ function f_print(){
<c:set var="totPrice" value="${totPrice + totfailPrice}"/> <c:set var="totPrice" value="${totPrice + totfailPrice}"/>
</p> </p>
</td> </td>
</tr </tr>
</tr> </tr>
</c:forEach> </c:forEach>
<tr class="total_price"> <tr class="total_price">

8
src/main/webapp/WEB-INF/jsp/web/kakao/include/KaKaoAlimtalkTopMenuTap.jsp
View File

@ -142,10 +142,10 @@ function cntntBtnInfo(stepInfo){
<ul class="tabType4"> <ul class="tabType4">
<li id="tabAt" class="tab topTab"><button type="button" onclick="javascript:fnLinkPageTopTab('tabAlim');">알림톡</button></li> <li id="tabAt" class="tab topTab"><button type="button" onclick="javascript:fnLinkPageTopTab('tabAlim');">알림톡</button></li>
<c:if test="${fn:contains(pageContext.request.requestURL , 'localhost') <%-- <c:if test="${fn:contains(pageContext.request.requestURL , 'localhost') --%>
|| fn:contains(pageContext.request.requestURL , '119.193.215.98')}"> <%-- || fn:contains(pageContext.request.requestURL , '119.193.215.98')}"> --%>
<li id="tabFt" class="tab topTab"><button type="button" onclick="javascript:fnLinkPageTopTab('tabFriend');">친구톡</button></li> <!-- <li id="tabFt" class="tab topTab"><button type="button" onclick="javascript:fnLinkPageTopTab('tabFriend');">친구톡</button></li> -->
</c:if> <%-- </c:if> --%>
<li id="tabConf" class="tab topTab"><button type="button" onclick="javascript:fnLinkPageTopTab('tabConf');">카카오톡 설정</button></li> <li id="tabConf" class="tab topTab"><button type="button" onclick="javascript:fnLinkPageTopTab('tabConf');">카카오톡 설정</button></li>
<li id="tabIntro" class="tab topTab"><button type="button" onclick="javascript:fnLinkPageTopTab('tabAlimtalkIntrd');">알림톡 소개</button></li> <li id="tabIntro" class="tab topTab"><button type="button" onclick="javascript:fnLinkPageTopTab('tabAlimtalkIntrd');">알림톡 소개</button></li>
</ul> </ul>

8
src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentView.jsp
View File

@ -946,10 +946,10 @@ function infoPop(pageUrl){
<ul class="list_tab"> <ul class="list_tab">
<li class="tab active"><button type="button" onclick="fnTabLoad('',0); return false;">전체</button></li> <li class="tab active"><button type="button" onclick="fnTabLoad('',0); return false;">전체</button></li>
<li class="tab"><button type="button" onclick="fnTabLoad('at', 1); return false;">알림톡</button></li> <li class="tab"><button type="button" onclick="fnTabLoad('at', 1); return false;">알림톡</button></li>
<c:if test="${fn:contains(pageContext.request.requestURL , 'localhost') <%-- <c:if test="${fn:contains(pageContext.request.requestURL , 'localhost') --%>
|| fn:contains(pageContext.request.requestURL , '119.193.215.98')}"> <%-- || fn:contains(pageContext.request.requestURL , '119.193.215.98')}"> --%>
<li class="tab"><button type="button" onclick="fnTabLoad('ft', 2); return false;">친구톡</button></li> <!-- <li class="tab"><button type="button" onclick="fnTabLoad('ft', 2); return false;">친구톡</button></li> -->
</c:if> <%-- </c:if> --%>
</ul><!--// tab button --> </ul><!--// tab button -->
</div> </div>
<!-- 예약관리 > 전체 --> <!-- 예약관리 > 전체 -->