diff --git a/src/main/java/itn/let/sym/log/clg/web/EtcStatController.java b/src/main/java/itn/let/sym/log/clg/web/EtcStatController.java index 9979e52f..dbd28720 100644 --- a/src/main/java/itn/let/sym/log/clg/web/EtcStatController.java +++ b/src/main/java/itn/let/sym/log/clg/web/EtcStatController.java @@ -4,11 +4,9 @@ import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; import java.util.List; -import java.util.Map; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -18,7 +16,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.support.RedirectAttributes; -import org.springframework.web.servlet.support.RequestContextUtils; import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper; import egovframework.rte.psl.dataaccess.util.EgovMap; @@ -27,11 +24,9 @@ import itn.com.cmm.EgovMessageSource; import itn.com.cmm.LoginVO; import itn.com.cmm.util.EgovDoubleSubmitHelper; import itn.com.cmm.util.RedirectUrlMaker; -import itn.com.uss.olh.hpc.service.HackIpVO; import itn.let.sym.log.clg.service.EtcStatService; import itn.let.sym.log.clg.service.EtcStatVO; import itn.let.sym.log.clg.service.PopSrhVO; -import itn.let.uss.umt.service.UserDefaultVO; /** * 기타통계를 관리하기 위한 컨트롤러 클래스 @@ -81,9 +76,10 @@ public class EtcStatController { SimpleDateFormat date = new SimpleDateFormat("yyyy-MM-dd"); String toDay = date.format(today); - //한달 전 + //1주 전 Calendar mon = Calendar.getInstance(); - mon.add(Calendar.MONTH , -1); + //mon.add(Calendar.MONTH , -1); + mon.add(Calendar.WEEK_OF_MONTH , -1); String beforeMonthDay = new java.text.SimpleDateFormat("yyyy-MM-dd").format(mon.getTime()); if (null == etcStatVO.getNtceBgnde() || etcStatVO.getNtceBgnde().equals("")) { diff --git a/src/main/java/itn/let/uat/uia/web/EgovMypageController.java b/src/main/java/itn/let/uat/uia/web/EgovMypageController.java index d5d5a391..af71b6c8 100644 --- a/src/main/java/itn/let/uat/uia/web/EgovMypageController.java +++ b/src/main/java/itn/let/uat/uia/web/EgovMypageController.java @@ -2011,6 +2011,7 @@ public class EgovMypageController { } } else { + /* // 기업회원>직원 인경우 if("c".equals(mberManageVO.getDept())) { //법인회원 일 경우 @@ -2025,7 +2026,8 @@ public class EgovMypageController { System.out.println("휴대폰인증 => 기업회원(직원) 직원이름 : " + managerNm); System.out.println("휴대폰인증 => 기업회원(직원) 인증이름 : " + kmcVO.getName().trim()); System.out.println("휴대폰인증 => 기업회원(직원) resultNameChk : " + resultNameChk); - } + } + */ } System.out.println("END 휴대폰인증"); 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 991e00ea..648790e6 100644 --- a/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java +++ b/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java @@ -1412,7 +1412,7 @@ public class EgovUserManageController { */ KakaoVO sendKakaoVO = new KakaoVO(); - sendKakaoVO.setSearchCondition2("N");//예약건은 제외하기 + //sendKakaoVO.setSearchCondition2("N");//예약건은 제외하기 sendKakaoVO.setReserveCYn("N");//예약취소건은 제외하기 sendKakaoVO.setUserId(reqMberManageVO.getMberId()); // 문자발송 완료건은 모두 보이도록 처리 @@ -1431,6 +1431,7 @@ public class EgovUserManageController { */ KakaoVO reserveKakaoVO = new KakaoVO(); + reserveKakaoVO.setReserveYn("Y"); //예약건만 조회 reserveKakaoVO.setSearchCondition2("Y");//예약건만 불러오기 reserveKakaoVO.setReserveCYn("N");//예약취소건은 제외하기 reserveKakaoVO.setUserId(reqMberManageVO.getMberId()); 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 3082d111..df0b4253 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 @@ -439,7 +439,7 @@ AGENT_CODE AS agentCode , RESERVE_YN AS reserveYn , RESERVE_C_YN AS reserveCYn , - CANCELDATE AS cancelDate , + DATE_FORMAT(CANCELDATE, '%Y-%m-%d %T') AS cancelDate , msgTypeName AS msgTypeName , orderByCode AS orderByCode , RESULT AS msgResult , @@ -554,13 +554,13 @@ - AND M.RESERVE_YN IN ('Y','N') + AND IFNULL(M.RESERVE_YN, 'N') IN ('Y','N') - AND M.RESERVE_YN = 'N' + AND IFNULL(M.RESERVE_YN, 'N') = 'N' - AND M.RESERVE_YN = 'Y' + AND IFNULL(M.RESERVE_YN, 'N') = 'Y' @@ -585,13 +585,13 @@ - AND M.RESERVE_YN IN ('Y','N') + AND IFNULL(M.RESERVE_YN, 'N') IN ('Y','N') - AND M.RESERVE_YN = 'N' + AND IFNULL(M.RESERVE_YN, 'N') = 'N' - AND M.RESERVE_YN = 'Y' + AND IFNULL(M.RESERVE_YN, 'N') = 'Y' @@ -1214,7 +1214,7 @@ AGENT_CODE AS agentCode , RESERVE_YN AS reserveYn , RESERVE_C_YN AS reserveCYn , - CANCELDATE AS cancelDate , + DATE_FORMAT(CANCELDATE, '%Y-%m-%d %T') AS cancelDate , msgTypeName AS msgTypeName , orderByCode AS orderByCode , RESULT AS msgResult , @@ -1227,7 +1227,7 @@ BL.CALL_STATUS AS callStatus, M.BIZ_KAKAO_RESEND_YN AS bizKakaoResendYn, M.AT_DELAY_COMPLETE_YN AS atDelayCompleteYn, - M.AT_DELAY_YN AS atDelayYn + M.AT_DELAY_YN AS atDelayYn FROM ( SELECT MG.USER_ID , MG.MSG_GROUP_ID , @@ -1319,13 +1319,13 @@ - AND M.RESERVE_YN IN ('Y','N') + AND IFNULL(M.RESERVE_YN, 'N') IN ('Y','N') - AND M.RESERVE_YN = 'N' + AND IFNULL(M.RESERVE_YN, 'N') = 'N' - AND M.RESERVE_YN = 'Y' + AND IFNULL(M.RESERVE_YN, 'N') = 'Y' @@ -1350,13 +1350,13 @@ - AND M.RESERVE_YN IN ('Y','N') + AND IFNULL(M.RESERVE_YN, 'N') IN ('Y','N') - AND M.RESERVE_YN = 'N' + AND IFNULL(M.RESERVE_YN, 'N') = 'N' - AND M.RESERVE_YN = 'Y' + AND IFNULL(M.RESERVE_YN, 'N') = 'Y' @@ -1364,7 +1364,7 @@ AND M.AT_DELAY_COMPLETE_YN ='Y' - AND M.REFUND_YN = 'N' + /*AND M.REFUND_YN = 'N'*/ @@ -1996,13 +1996,13 @@ - AND M.RESERVE_YN IN ('Y','N') + AND IFNULL(M.RESERVE_YN, 'N') IN ('Y','N') - AND M.RESERVE_YN = 'N' + AND IFNULL(M.RESERVE_YN, 'N') = 'N' - AND M.RESERVE_YN = 'Y' + AND IFNULL(M.RESERVE_YN, 'N') = 'Y' diff --git a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml index 6679cd37..11537aaf 100644 --- a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml @@ -5563,40 +5563,31 @@ @@ -5605,18 +5596,16 @@ COUNT(0) totCnt FROM ( SELECT - DATE_FORMAT(L.CREAT_DT, '%Y-%m-%d') regDate - FROM LETTNLOGINLOG L + STAT_DATE regDate + FROM MJ_DASH_STAT L WHERE 1=1 - AND L.DEVICE_TYPE = 'P' - AND = #ntceBgnde# ]]> + AND = #ntceBgnde# ]]> - AND + AND - AND - GROUP BY DATE_FORMAT(L.CREAT_DT, '%Y-%m-%d') + AND ) M diff --git a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp index ada033fa..bb224a70 100644 --- a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp +++ b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp @@ -3902,6 +3902,15 @@ function kakaoATDelayCancel(msgGroupId){ + + + [발송취소]
+ + [예약]
+
+ +
+
[예약취소]
@@ -3910,12 +3919,6 @@ function kakaoATDelayCancel(msgGroupId){ [예약]
- - - [발송취소]
- -
-
- @@ -4109,6 +4112,15 @@ function kakaoATDelayCancel(msgGroupId){ + + + [발송취소]
+ + [예약]
+
+ +
+
[예약취소]
@@ -4117,12 +4129,6 @@ function kakaoATDelayCancel(msgGroupId){ [예약]
- - - [발송취소]
- -
-
- @@ -4525,6 +4531,16 @@ function kakaoATDelayCancel(msgGroupId){ + + + [발송취소]
+ + [예약]
+
+ + +
+
[예약취소]
@@ -4652,6 +4668,16 @@ function kakaoATDelayCancel(msgGroupId){
+ + + [발송취소]
+ + [예약]
+
+ + +
+
[예약취소]
diff --git a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/kakao/EgovGnrlUserSelectKakaoDataListPop.jsp b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/kakao/EgovGnrlUserSelectKakaoDataListPop.jsp index f6d36715..e9d54857 100644 --- a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/kakao/EgovGnrlUserSelectKakaoDataListPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/kakao/EgovGnrlUserSelectKakaoDataListPop.jsp @@ -404,6 +404,7 @@ function msgDetailClose(obj){ + @@ -414,6 +415,7 @@ function msgDetailClose(obj){ 아이디 채널ID 발송건수 + 스미싱의심 요청시간 예약 내용 @@ -457,6 +459,37 @@ function msgDetailClose(obj){
+ + + + + + + + 오프[발송취소] + "> + + + + + + + + 오프[미처리] + + + + + 오프[승인] + + + + + + - + + + diff --git a/src/main/webapp/WEB-INF/jsp/sym/log/clg/SelectDeviceLogList.jsp b/src/main/webapp/WEB-INF/jsp/sym/log/clg/SelectDeviceLogList.jsp index dc73cebe..7714a2d4 100644 --- a/src/main/webapp/WEB-INF/jsp/sym/log/clg/SelectDeviceLogList.jsp +++ b/src/main/webapp/WEB-INF/jsp/sym/log/clg/SelectDeviceLogList.jsp @@ -94,6 +94,11 @@ $(document).ready(function(){ +
+
+ (30분 단위 업데이트) +
+
diff --git a/src/main/webapp/WEB-INF/jsp/sym/log/clg/bannerClickStat.jsp b/src/main/webapp/WEB-INF/jsp/sym/log/clg/bannerClickStat.jsp index feb450bb..6e2595fa 100644 --- a/src/main/webapp/WEB-INF/jsp/sym/log/clg/bannerClickStat.jsp +++ b/src/main/webapp/WEB-INF/jsp/sym/log/clg/bannerClickStat.jsp @@ -231,6 +231,7 @@ function fnSetCalMonth(val) {