From d698e9decff1a45741193bec47074bee8a71d901 Mon Sep 17 00:00:00 2001 From: JIWOO Date: Tue, 24 Jun 2025 17:40:48 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=EC=9E=90=20>=20=EC=95=8C=EB=A6=BC=ED=86=A1=20?= =?UTF-8?q?=EC=98=88=EC=95=BD=EC=A1=B0=ED=9A=8C=20=EB=A9=94=EB=89=B4=20?= =?UTF-8?q?=EC=86=8D=EB=8F=84=20=EA=B0=9C=EC=84=A0=EC=9D=84=20=EC=9C=84?= =?UTF-8?q?=ED=95=9C=20=ED=98=B8=EC=B6=9C=20=EC=BF=BC=EB=A6=AC=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kakaoAt/web/MjonKakaoATController.java | 32 +++++++++++++------ 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/src/main/java/itn/let/kakao/admin/kakaoAt/web/MjonKakaoATController.java b/src/main/java/itn/let/kakao/admin/kakaoAt/web/MjonKakaoATController.java index 4de59b4..0277f84 100644 --- a/src/main/java/itn/let/kakao/admin/kakaoAt/web/MjonKakaoATController.java +++ b/src/main/java/itn/let/kakao/admin/kakaoAt/web/MjonKakaoATController.java @@ -321,23 +321,35 @@ public class MjonKakaoATController { } searchVO.setSearchCondition2("Y"); - List resultList = mjonKakaoATService.selectReserveMjonKakaoATGroupList(searchVO); + //250624 - 최소한의 정보만 조회하는 개선 쿼리로 변경 + //List resultList = mjonKakaoATService.selectReserveMjonKakaoATGroupList(searchVO); + + // 기간검색 설정 + String toDay = MJUtil.getTodayDate(); //오늘 + String beforeMonthDay = MJUtil.getBefore1MonthDate(); //한달 전 + if (null == searchVO.getNtceBgnde() || searchVO.getNtceBgnde().equals("")) { + searchVO.setNtceBgnde(beforeMonthDay); + } + + List resultList = mjonKakaoATService.selectMjonKakaoATGroupCompleteByUserList_advc(searchVO); + int totCnt = mjonKakaoATService.selectMjonKakaoATGroupCompleteByUserListCnt_advc(searchVO); model.addAttribute("resultList", resultList); - model.addAttribute("todayYn", "N"); - - if (isTodaySelected(searchVO)) { - // 금일 예약발송 대기건수 - int msgGroupCntSum = mjonKakaoATService.selectMjonKakaoATGroupCntSum(searchVO); - model.addAttribute("todayYn", "Y"); - model.addAttribute("msgGroupCntSum", msgGroupCntSum); - } + /* + * model.addAttribute("todayYn", "N"); + * + * if (isTodaySelected(searchVO)) { // 금일 예약발송 대기건수 int msgGroupCntSum = + * mjonKakaoATService.selectMjonKakaoATGroupCntSum(searchVO); + * model.addAttribute("todayYn", "Y"); model.addAttribute("msgGroupCntSum", + * msgGroupCntSum); } + */ //알림톡발송 실패 결과 코드정보 리스트 불러오기 List resultMsgCodeList = mjonMsgService.selectMsgResultCodeAllList(new MjonMsgResultCodeVO()); model.addAttribute("resultMsgCodeList", resultMsgCodeList); - paginationInfo.setTotalRecordCount(resultList.size() > 0 ? resultList.get(0).getTotCnt() : 0); + //paginationInfo.setTotalRecordCount(resultList.size() > 0 ? resultList.get(0).getTotCnt() : 0); + paginationInfo.setTotalRecordCount(totCnt); model.addAttribute("paginationInfo", paginationInfo); } catch (Exception e) {