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 c4004bac..4189ec2f 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 @@ -20,6 +20,7 @@ import itn.com.cmm.ComDefaultCodeVO; import itn.com.cmm.LoginVO; import itn.com.cmm.service.EgovCmmUseService; import itn.com.cmm.service.FileVO; +import itn.com.cmm.util.MJUtil; import itn.com.cmm.util.StringUtil; import itn.let.kakao.admin.kakaoAt.service.ChannelIDVO; import itn.let.kakao.admin.kakaoAt.service.MjonKakaoATService; @@ -231,7 +232,15 @@ public class MjonKakaoATController { kakaoVO.setReserveCYn("N");//예약취소건은 제외하기 // 문자발송 완료건은 모두 보이도록 처리 //kakaoVO.setMsgType("8"); - resultList = mjonKakaoATService.selectMjonKakaoATGroupCompleteList(kakaoVO); + + // 기간검색 설정 + String toDay = MJUtil.getTodayDate(); //오늘 + String beforeMonthDay = MJUtil.getBefore1MonthDate(); //한달 전 + if (null == kakaoVO.getNtceBgnde() || kakaoVO.getNtceBgnde().equals("")) { + kakaoVO.setNtceBgnde(beforeMonthDay); + } + + resultList = mjonKakaoATService.selectMjonKakaoATGroupCompleteByUserList(kakaoVO); model.addAttribute("resultList", resultList); diff --git a/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java b/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java index 628db524..a23ce9de 100644 --- a/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java +++ b/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java @@ -78,7 +78,6 @@ import itn.let.cop.bbs.service.BoardVO; import itn.let.fax.user.service.FaxGroupDataVO; import itn.let.fax.user.service.FaxService; import itn.let.kakao.admin.kakaoAt.service.ChannelIDVO; -import itn.let.kakao.admin.kakaoAt.service.MjonKakaoATSentVO; import itn.let.kakao.admin.kakaoAt.service.MjonKakaoATService; import itn.let.kakao.kakaoComm.KakaoReturnVO; import itn.let.kakao.kakaoComm.KakaoVO; @@ -1168,8 +1167,8 @@ public class EgovUserManageController { * 최근 알리톡/친구톡 전송 내역 * */ //최근 발송 문자 내용 불러오기 - 최근 3개 내역만 - List mjonKakaoATSentList = mjonKakaoATService.selectMberKakaoATSentLatestList(userId); - model.addAttribute("mjonKakaoATSentList", mjonKakaoATSentList); + //List mjonKakaoATSentList = mjonKakaoATService.selectMberKakaoATSentLatestList(userId); + //model.addAttribute("mjonKakaoATSentList", mjonKakaoATSentList); } { diff --git a/src/main/resources/egovframework/sqlmap/let/kakao/MjonKakaoATData_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/kakao/MjonKakaoATData_SQL_mysql.xml index da59d000..5ae1479a 100644 --- a/src/main/resources/egovframework/sqlmap/let/kakao/MjonKakaoATData_SQL_mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/kakao/MjonKakaoATData_SQL_mysql.xml @@ -208,7 +208,6 @@ LEFT JOIN MJ_KAKAO_PROFILE_INFO MKPI ON M.MSG_NOTICETALK_SENDER_KEY = MKPI.SENDER_KEY AND MKPI.USER_ID = M.USER_ID - AND MKPI.DELETE_YN = 'N' LEFT JOIN LETTNGNRLMBER LTM ON M.USER_ID = LTM.MBER_ID LEFT JOIN BIZ_LOG BL @@ -519,7 +518,6 @@ LEFT JOIN MJ_KAKAO_PROFILE_INFO MKPI ON M.MSG_NOTICETALK_SENDER_KEY = MKPI.SENDER_KEY AND MKPI.USER_ID = M.USER_ID - AND MKPI.DELETE_YN = 'N' LEFT JOIN LETTNGNRLMBER LTM ON M.USER_ID = LTM.MBER_ID LEFT JOIN BIZ_LOG BL @@ -1029,50 +1027,86 @@