--- src/main/java/itn/let/fax/addr/web/FaxAddrController.java
+++ src/main/java/itn/let/fax/addr/web/FaxAddrController.java
... | ... | @@ -14,6 +14,7 @@ |
| 14 | 14 |
import javax.servlet.http.HttpServletRequest; |
| 15 | 15 |
import javax.servlet.http.HttpServletResponse; |
| 16 | 16 |
|
| 17 |
+import org.apache.commons.lang3.StringUtils; |
|
| 17 | 18 |
import org.apache.poi.hssf.usermodel.HSSFCell; |
| 18 | 19 |
import org.apache.poi.hssf.usermodel.HSSFRow; |
| 19 | 20 |
import org.apache.poi.hssf.usermodel.HSSFSheet; |
... | ... | @@ -208,8 +209,13 @@ |
| 208 | 209 |
addrVO.setSearchSortCnd("addrId");
|
| 209 | 210 |
addrVO.setSearchSortOrd("asc");
|
| 210 | 211 |
} |
| 211 |
- |
|
| 212 |
- List<FaxAddrVO> addrList = faxAddrService.selectFaxAddrList(addrVO); |
|
| 212 |
+ System.out.println("=================================================="+addrVO.getSearchAddrGrpId());
|
|
| 213 |
+ List<FaxAddrVO> addrList = new ArrayList(); |
|
| 214 |
+ if(StringUtils.isNotEmpty(addrVO.getSearchAddrGrpId())) {
|
|
| 215 |
+ addrList = faxAddrService.selectFaxAddrList(addrVO); |
|
| 216 |
+ |
|
| 217 |
+ } |
|
| 218 |
+ System.out.println("==================================================");
|
|
| 213 | 219 |
|
| 214 | 220 |
int totCnt = 0; |
| 215 | 221 |
if(addrList.size() > 0) {
|
--- src/main/java/itn/let/fax/addr/web/FaxAddrGroupController.java
+++ src/main/java/itn/let/fax/addr/web/FaxAddrGroupController.java
... | ... | @@ -89,15 +89,36 @@ |
| 89 | 89 |
addrGroupVO.setSiteId("web");
|
| 90 | 90 |
List<FaxAddrGroupVO> addrGroupList = faxAddrGroupService.selectFaxAddrGroupList(addrGroupVO); |
| 91 | 91 |
|
| 92 |
- //회원별 주소록 전체 갯수 조회 |
|
| 93 |
- int addrTotalCount = faxAddrService.selectFaxAddrTotalCount(addrVO); |
|
| 92 |
+// //회원별 주소록 전체 갯수 조회 |
|
| 93 |
+// int addrTotalCount = faxAddrService.selectFaxAddrTotalCount(addrVO); |
|
| 94 | 94 |
|
| 95 | 95 |
addrVO.setType("bookmark");
|
| 96 | 96 |
List<FaxAddrVO> addrBookmarkList = faxAddrService.selectFaxAddrBasicGrpList(addrVO); |
| 97 | 97 |
|
| 98 | 98 |
addrVO.setType("noGrp");
|
| 99 | 99 |
List<FaxAddrVO> addrNoGrpList = faxAddrService.selectFaxAddrBasicGrpList(addrVO); |
| 100 |
+ |
|
| 100 | 101 |
|
| 102 |
+ int totalGrpCount = addrGroupList.stream() |
|
| 103 |
+ .mapToInt(group -> {
|
|
| 104 |
+ String grpCountStr = group.getGrpCount(); |
|
| 105 |
+ if (grpCountStr != null && !grpCountStr.isEmpty()) {
|
|
| 106 |
+ try {
|
|
| 107 |
+ return Integer.parseInt(grpCountStr); |
|
| 108 |
+ } catch (NumberFormatException e) {
|
|
| 109 |
+ // 파싱에 실패한 경우 0을 반환하거나 예외 처리를 합니다. |
|
| 110 |
+ return 0; |
|
| 111 |
+ } |
|
| 112 |
+ } else {
|
|
| 113 |
+ return 0; |
|
| 114 |
+ } |
|
| 115 |
+ }) |
|
| 116 |
+ .sum(); |
|
| 117 |
+ |
|
| 118 |
+ int addrTotalCount = (addrNoGrpList.size() >0 ? addrNoGrpList.get(0).getTotcnt() : 0) |
|
| 119 |
+ + (addrBookmarkList.size() >0 ? addrBookmarkList.get(0).getTotcnt() : 0) |
|
| 120 |
+ + totalGrpCount |
|
| 121 |
+ ; |
|
| 101 | 122 |
|
| 102 | 123 |
|
| 103 | 124 |
model.addAttribute("addrTotalCount", addrTotalCount);
|
--- src/main/java/itn/let/sym/grd/web/MberGrdMngController.java
+++ src/main/java/itn/let/sym/grd/web/MberGrdMngController.java
... | ... | @@ -362,6 +362,7 @@ |
| 362 | 362 |
msg = e.getMessage(); |
| 363 | 363 |
} |
| 364 | 364 |
|
| 365 |
+ System.out.println("rtnMberGrdVO :: "+ rtnMberGrdVO.getGrdSetNm());
|
|
| 365 | 366 |
modelAndView.addObject("rtnMberGrdVO", rtnMberGrdVO);
|
| 366 | 367 |
modelAndView.addObject("isSuccess", isSuccess);
|
| 367 | 368 |
modelAndView.addObject("msg", msg);
|
--- src/main/webapp/WEB-INF/jsp/web/fax/addr/FaxAddrListAjax.jsp
+++ src/main/webapp/WEB-INF/jsp/web/fax/addr/FaxAddrListAjax.jsp
... | ... | @@ -706,7 +706,7 @@ |
| 706 | 706 |
</c:when> |
| 707 | 707 |
<c:otherwise> |
| 708 | 708 |
<tr> |
| 709 |
- <td colspan="6">검색 결과가 없습니다.</td> |
|
| 709 |
+ <td colspan="6">검색 결과가 없거나, 좌측 그룹을 선택해 주세요.</td> |
|
| 710 | 710 |
</tr> |
| 711 | 711 |
</c:otherwise> |
| 712 | 712 |
</c:choose> |
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?