--- src/main/java/itn/let/fax/addr/web/FaxAddrController.java
+++ src/main/java/itn/let/fax/addr/web/FaxAddrController.java
... | ... | @@ -1665,7 +1665,7 @@ |
| 1665 | 1665 |
List<FaxAddrGroupVO> addrGroupList = faxAddrGroupService.selectFaxAddrGroupList(faxaddrGroupVO); |
| 1666 | 1666 |
|
| 1667 | 1667 |
//회원별 주소록 전체 갯수 조회 |
| 1668 |
- int addrTotalCount = faxAddrService.selectFaxAddrTotalCount(faxaddrVO); |
|
| 1668 |
+// int addrTotalCount = faxAddrService.selectFaxAddrTotalCount(faxaddrVO); |
|
| 1669 | 1669 |
|
| 1670 | 1670 |
faxaddrVO.setType("bookmark");
|
| 1671 | 1671 |
List<FaxAddrVO> addrBookmarkList = faxAddrService.selectFaxAddrBasicGrpList(faxaddrVO); |
... | ... | @@ -1673,6 +1673,30 @@ |
| 1673 | 1673 |
faxaddrVO.setType("noGrp");
|
| 1674 | 1674 |
List<FaxAddrVO> addrNoGrpList = faxAddrService.selectFaxAddrBasicGrpList(faxaddrVO); |
| 1675 | 1675 |
|
| 1676 |
+ |
|
| 1677 |
+ |
|
| 1678 |
+ int totalGrpCount = addrGroupList.stream() |
|
| 1679 |
+ .mapToInt(group -> {
|
|
| 1680 |
+ String grpCountStr = group.getGrpCount(); |
|
| 1681 |
+ if (grpCountStr != null && !grpCountStr.isEmpty()) {
|
|
| 1682 |
+ try {
|
|
| 1683 |
+ return Integer.parseInt(grpCountStr); |
|
| 1684 |
+ } catch (NumberFormatException e) {
|
|
| 1685 |
+ // 파싱에 실패한 경우 0을 반환하거나 예외 처리를 합니다. |
|
| 1686 |
+ return 0; |
|
| 1687 |
+ } |
|
| 1688 |
+ } else {
|
|
| 1689 |
+ return 0; |
|
| 1690 |
+ } |
|
| 1691 |
+ }) |
|
| 1692 |
+ .sum(); |
|
| 1693 |
+ |
|
| 1694 |
+ int addrTotalCount = (addrNoGrpList.size() >0 ? addrNoGrpList.get(0).getTotcnt() : 0) |
|
| 1695 |
+ + (addrBookmarkList.size() >0 ? addrBookmarkList.get(0).getTotcnt() : 0) |
|
| 1696 |
+ + totalGrpCount |
|
| 1697 |
+ ; |
|
| 1698 |
+ |
|
| 1699 |
+ |
|
| 1676 | 1700 |
model.addAttribute("addrTotalCount", addrTotalCount);
|
| 1677 | 1701 |
model.addAttribute("addrGroupList", addrGroupList);
|
| 1678 | 1702 |
model.addAttribute("addrBookmarkList", addrBookmarkList);
|
--- src/main/webapp/WEB-INF/jsp/web/fax/addr/FaxAddrGroupListAjaxView.jsp
+++ src/main/webapp/WEB-INF/jsp/web/fax/addr/FaxAddrGroupListAjaxView.jsp
... | ... | @@ -13,12 +13,13 @@ |
| 13 | 13 |
</script> |
| 14 | 14 |
|
| 15 | 15 |
<div class="adr_pop_list"> |
| 16 |
- <div class="adr_cb_wrap2"> |
|
| 16 |
+ <div class="adr_cb_wrap2 total_adr_cb_wrap"> |
|
| 17 | 17 |
<%-- <label for="group0" class="label"></label> |
| 18 | 18 |
<input type="checkbox" name="grpCheck" id="group0" value="all"> --%> |
| 19 |
- <p onClick="javascript:fnSelectAddrList('all','',this); return false;">
|
|
| 20 |
- <img src="/publish/images/content/close_folder2.png" alt="폴더 닫힘">전체[<span><c:out value="${addrTotalCount}"/></span>명]
|
|
| 21 |
- </p> |
|
| 19 |
+<!-- <p onClick="javascript:fnSelectAddrList('all','',this); return false;"> -->
|
|
| 20 |
+<!-- <img src="/publish/images/content/close_folder2.png" alt="폴더 닫힘"> --> |
|
| 21 |
+ 전체<p><fmt:formatNumber value="${addrTotalCount}" pattern="#,###"/><span>명</span></p>
|
|
| 22 |
+<!-- </p> --> |
|
| 22 | 23 |
</div> |
| 23 | 24 |
<c:set var="noGrpSize" value="${fn:length(addrNoGrpList)}" />
|
| 24 | 25 |
<div class="adr_cb_wrap2"> |
--- src/main/webapp/WEB-INF/jsp/web/fax/faxDataView.jsp
+++ src/main/webapp/WEB-INF/jsp/web/fax/faxDataView.jsp
... | ... | @@ -562,7 +562,7 @@ |
| 562 | 562 |
|
| 563 | 563 |
<!-- 주소록 불러오기 --> |
| 564 | 564 |
<div class="tooltip-wrap"> |
| 565 |
- <div class="popup-com import_layer popup06" tabindex="0" data-tooltip-con="popup06" data-focus="popup06" data-focus-prev="popup06-close" style="width: 1000px;z-index:98"> |
|
| 565 |
+ <div class="popup-com import_layer popup06 adr_call_popup" tabindex="0" data-tooltip-con="popup06" data-focus="popup06" data-focus-prev="popup06-close" style="width: 1000px;z-index:98"> |
|
| 566 | 566 |
<div class="popup_heading"> |
| 567 | 567 |
<p><span>주소록 불러오기</p> |
| 568 | 568 |
<button type="button" onClick="javascript:addrToList_close(); return false;"> |
... | ... | @@ -835,7 +835,7 @@ |
| 835 | 835 |
<p>문자 전송 결과</p> |
| 836 | 836 |
</div> |
| 837 | 837 |
<div class="layer_in"> |
| 838 |
- <div class="msg_text" |
|
| 838 |
+ <div class="msg_text"> |
|
| 839 | 839 |
</div> |
| 840 | 840 |
</div> |
| 841 | 841 |
<div class="popup_btn"> |
--- src/main/webapp/js/user/fax/addr.js
+++ src/main/webapp/js/user/fax/addr.js
... | ... | @@ -209,7 +209,15 @@ |
| 209 | 209 |
alert("주소록 불러오기에 실패하였습니다. !!");
|
| 210 | 210 |
} |
| 211 | 211 |
}, |
| 212 |
- error: function (e) { alert("주소록 불러오기에 실패하였습니다."); console.log("ERROR : ", e); }
|
|
| 212 |
+ error: function (e) { alert("주소록 불러오기에 실패하였습니다."); console.log("ERROR : ", e); },
|
|
| 213 |
+ beforeSend : function(xmlHttpRequest) {
|
|
| 214 |
+ //로딩창 show |
|
| 215 |
+ $('.loading_layer').addClass('active');
|
|
| 216 |
+ }, |
|
| 217 |
+ complete : function(xhr, textStatus) {
|
|
| 218 |
+ //로딩창 hide |
|
| 219 |
+ $('.loading_layer').removeClass('active');
|
|
| 220 |
+ } |
|
| 213 | 221 |
}); |
| 214 | 222 |
} |
| 215 | 223 |
|
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?