Merge branch 'tolag3'

This commit is contained in:
leejunho 2025-05-15 11:43:21 +09:00
commit a01a9b63bf
3 changed files with 81 additions and 50 deletions

View File

@ -714,6 +714,19 @@ public class EgovMainController {
ydayAcnt = rtnStatsVO.getYdayAcnt(); ydayAcnt = rtnStatsVO.getYdayAcnt();
} }
BoardVO boardVO = new BoardVO();
boardVO.setFirstIndex(0);
boardVO.setRecordCountPerPage(5);
boardVO.setSearchSortCnd("frstRegisterPnttm");
boardVO.setSearchSortOrd("desc");
//오늘
int adminMainNewBoardCnt = bbsMngService.selectAdminMainNewBoardCnt(boardVO);
resultMap.put("adminMainNewBoardCnt", adminMainNewBoardCnt);
//어젝
int adminMainYdaBoardCnt = bbsMngService.selectAdminMainYdaBoardCnt(boardVO);
resultMap.put("adminMainYdaBoardCnt", adminMainYdaBoardCnt);
resultMap.put("isSuccess", true); resultMap.put("isSuccess", true);
resultMap.put("userViewCnt", tdayUcnt); resultMap.put("userViewCnt", tdayUcnt);
resultMap.put("adminViewCnt", tdayAcnt); resultMap.put("adminViewCnt", tdayAcnt);
@ -919,6 +932,16 @@ public class EgovMainController {
} }
model.addAttribute("adminPayDayChart", adminPayDayChart); model.addAttribute("adminPayDayChart", adminPayDayChart);
MberManageVO mberManageTotStatsVO = new MberManageVO();
String statStr = conectStatsService.selectTodaySttCountString(mberManageTotStatsVO);
String[] split = statStr.split("_");
if (split.length == 3) {
model.addAttribute("todayExpireCnt", split[0]);
model.addAttribute("todayStopCnt", split[1]);
model.addAttribute("refundRequestCnt", split[2]);
}
return "main/payDayChartStats"; return "main/payDayChartStats";
} }

View File

@ -88,7 +88,7 @@
//일매출액(VAT 포함) //일매출액(VAT 포함)
toggleLoadingMask("payDayChartBox", true); toggleLoadingMask("payDayChartBox", true);
$("#payDayChartContainer").load("/cmm/main/payDayChartStatsAjax.do", function () { $("#payDayChartBox").load("/cmm/main/payDayChartStatsAjax.do", function () {
toggleLoadingMask("payDayChartBox", false); toggleLoadingMask("payDayChartBox", false);
}); });
@ -180,7 +180,7 @@
dataType: "json", dataType: "json",
beforeSend: function () { beforeSend: function () {
// 로딩 마스크 표시 // 로딩 마스크 표시
toggleLoadingMask("visitStatBox", true); toggleLoadingMask("visitStatInfoBox", true);
}, },
success: function (data) { success: function (data) {
if (data.isSuccess) { if (data.isSuccess) {
@ -188,6 +188,8 @@
$("#adminViewCnt").text(data.adminViewCnt || 0); $("#adminViewCnt").text(data.adminViewCnt || 0);
$("#userViewCnt2").text(data.userViewCnt2 || 0); $("#userViewCnt2").text(data.userViewCnt2 || 0);
$("#userViewCnt").text(data.userViewCnt || 0); $("#userViewCnt").text(data.userViewCnt || 0);
$("#adminMainNewBoardCnt").text(data.adminMainNewBoardCnt || 0);
$("#adminMainYdaBoardCnt").text(data.adminMainYdaBoardCnt || 0);
} }
}, },
error: function (xhr, status, error) { error: function (xhr, status, error) {
@ -195,7 +197,7 @@
}, },
complete: function () { complete: function () {
// 로딩 마스크 제거 // 로딩 마스크 제거
toggleLoadingMask("visitStatBox", false); toggleLoadingMask("visitStatInfoBox", false);
} }
}); });
} }
@ -272,7 +274,7 @@
</span> </span>
<input type="button" class="plusBtn" onclick="goMenuPage('81000000', '/uss/umt/user/EgovUserManage.do'); return false;"> <input type="button" class="plusBtn" onclick="goMenuPage('81000000', '/uss/umt/user/EgovUserManage.do'); return false;">
</div> </div>
<div class="boxCont" id="visitStatBox"> <div class="boxCont" id="visitStatInfoBox">
<ul class="inline"> <ul class="inline">
<li> <li>
<a href="#" onclick="goMenuPage('82500000', '/sym/log/clg/SelectLoginLogGroupList.do'); return false;"><div class="icon"><img src="/pb/img/dashBoardImg1.png" alt=""></div></a> <a href="#" onclick="goMenuPage('82500000', '/sym/log/clg/SelectLoginLogGroupList.do'); return false;"><div class="icon"><img src="/pb/img/dashBoardImg1.png" alt=""></div></a>
@ -309,7 +311,12 @@
<a href="#" onclick="goMenuPage('81800000', '/cop/bbs/SelectBbsContentsList.do'); return false;"> <a href="#" onclick="goMenuPage('81800000', '/cop/bbs/SelectBbsContentsList.do'); return false;">
<div class="icon"><img src="/pb/img/dashBoardImg3.png" alt=""></div> <div class="icon"><img src="/pb/img/dashBoardImg3.png" alt=""></div>
<div class="tType6 c_b4b4b4 small_text">어제/오늘</div> <div class="tType6 c_b4b4b4 small_text">어제/오늘</div>
<p class="tType1 fwExtBold c_222222 large_text">${adminMainYdaBoardCnt}/<span <c:if test="${adminMainNewBoardCnt > 0}">style="color:red"</c:if>>${adminMainNewBoardCnt}</span></p> <%-- <p class="tType1 fwExtBold c_222222 large_text">${adminMainYdaBoardCnt}/<span <c:if test="${adminMainNewBoardCnt > 0}">style="color:red"</c:if>>${adminMainNewBoardCnt}</span></p> --%>
<p class="tType1 fwExtBold c_222222 large_text">
<span id="adminMainYdaBoardCnt">0</span>
/
<span id="adminMainNewBoardCnt">0</span>
</p>
<p class="tType5 c_333333 middle_text" style="padding-bottom:5px;">새 게시글</p> <p class="tType5 c_333333 middle_text" style="padding-bottom:5px;">새 게시글</p>
<%--<p class="tType6 c_b4b4b4">금일</p>--%> <%--<p class="tType6 c_b4b4b4">금일</p>--%>
</a> </a>
@ -355,22 +362,6 @@
</div> </div>
<div class="box" id="payDayChartBox"> <div class="box" id="payDayChartBox">
<div class="boxTitle">
<h3 class="titType2 fwBold" style="padding-right: 10px;">일매출액(VAT 포함)</h3>
<span class="tType6 c_b4b4b4">
<c:choose>
<c:when test="${refundRequestCnt > 0}">
<a href="#" onclick="goMenuPage('4550000', '/uss/ion/pay/RefundList.do'); return false;">환불/취소 : <span style="color: red; font-weight: bold;"><c:out value="${refundRequestCnt}"/></span></a>
</c:when>
<c:otherwise>
<a href="#" onclick="goMenuPage('4550000', '/uss/ion/pay/RefundList.do'); return false;">환불/취소 : <c:out value="${refundRequestCnt}"/></a>
</c:otherwise>
</c:choose>
</span>
<input type="button" class="plusBtn" onclick="goMenuPage('5400000', '/uss/ion/pay/payDayChart.do'); return false;">
</div>
<div class="boxCont" id="payDayChartContainer" onclick="goMenuPage('5400000', '/uss/ion/pay/payDayChart.do'); return false;">
</div>
</div> </div>
<div class="box" id="payMonthChartBox"> <div class="box" id="payMonthChartBox">

View File

@ -3,34 +3,51 @@
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<table class="tbType1" style="cursor:help !important;" border="1">
<colgroup> <div class="boxTitle">
<col style="width: *%;"> <h3 class="titType2 fwBold" style="padding-right: 10px;">일매출액(VAT 포함)</h3>
<col style="width: 33%;"> <span class="tType6 c_b4b4b4">
<col style="width: 24%;"> <c:choose>
<col style="width: 25%;"> <c:when test="${refundRequestCnt > 0}">
</colgroup> <a href="#" onclick="goMenuPage('4550000', '/uss/ion/pay/RefundList.do'); return false;">환불/취소 : <span style="color: red; font-weight: bold;"><c:out value="${refundRequestCnt}"/></span></a>
<tr> </c:when>
<td>일자</td> <c:otherwise>
<td style="text-align: right; padding-right: 19px;">결제</td> <a href="#" onclick="goMenuPage('4550000', '/uss/ion/pay/RefundList.do'); return false;">환불/취소 : <c:out value="${refundRequestCnt}"/></a>
<td style="text-align: right; padding-right: 10px;">환불</td> </c:otherwise>
<td style="text-align: right; padding-right: 15px;">합계</td> </c:choose>
</tr> </span>
<c:forEach items="${adminPayDayChart}" var="result"> <input type="button" class="plusBtn" onclick="goMenuPage('5400000', '/uss/ion/pay/payDayChart.do'); return false;">
</div>
<div class="boxCont" id="payDayChartContainer" onclick="goMenuPage('5400000', '/uss/ion/pay/payDayChart.do'); return false;">
<table class="tbType1" style="cursor:help !important;" border="1">
<colgroup>
<col style="width: *%;">
<col style="width: 33%;">
<col style="width: 24%;">
<col style="width: 25%;">
</colgroup>
<tr> <tr>
<td><c:out value="${result.regDate}" /></td> <td>일자</td>
<td class="right c_999999"> <td style="text-align: right; padding-right: 19px;">결제</td>
<fmt:formatNumber value="${result.amtTotSum + result.amtRefundSum}" pattern="#,###" /> <td style="text-align: right; padding-right: 10px;">환불</td>
<c:if test="${result.amtTotCnt + result.amtRefundCnt > 0}"> <td style="text-align: right; padding-right: 15px;">합계</td>
(<fmt:formatNumber value="${result.amtTotCnt + result.amtRefundCnt}" pattern="#,###" />)
</c:if>
</td>
<td class="right c_999999">
<fmt:formatNumber value="${result.amtRefundSum}" pattern="#,###" />
</td>
<td class="right c_999999">
<fmt:formatNumber value="${result.amtTotSum}" pattern="#,###" />
</td>
</tr> </tr>
</c:forEach> <c:forEach items="${adminPayDayChart}" var="result">
</table> <tr>
<td><c:out value="${result.regDate}" /></td>
<td class="right c_999999">
<fmt:formatNumber value="${result.amtTotSum + result.amtRefundSum}" pattern="#,###" />
<c:if test="${result.amtTotCnt + result.amtRefundCnt > 0}">
(<fmt:formatNumber value="${result.amtTotCnt + result.amtRefundCnt}" pattern="#,###" />)
</c:if>
</td>
<td class="right c_999999">
<fmt:formatNumber value="${result.amtRefundSum}" pattern="#,###" />
</td>
<td class="right c_999999">
<fmt:formatNumber value="${result.amtTotSum}" pattern="#,###" />
</td>
</tr>
</c:forEach>
</table>
</div>