Commit @6c6bd1093cd2e71bea899db3295604f55da83ca9

wyh 2023-07-07

알림톡 전송지연 기능 추가

@6c6bd1093cd2e71bea899db3295604f55da83ca9

e9c8cfe

6c6bd10

src/main/java/itn/let/kakao/user/kakaoAt/service/impl/KakaoAlimTalkServiceImpl.java

--- src/main/java/itn/let/kakao/user/kakaoAt/service/impl/KakaoAlimTalkServiceImpl.java

+++ src/main/java/itn/let/kakao/user/kakaoAt/service/impl/KakaoAlimTalkServiceImpl.java


 				}
 				
 				if(kakaoVO.getAtSmishingYn().equals("Y")) {
-					String sandDate = kakaoVO.getReqDate();
+					String sandDate = "";
+					
+					if(kakaoVO.getDivideChk().equals("Y")) {
+						//분할 문자 예약 시간 입력해주기
+						sandDate = dividDayList.get(i);
+					}else {
+						//예약 시간 입력해주기
+						sandDate = kakaoVO.getReqDate();
+					}
+					
 					SimpleDateFormat sdFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
 					Date date = sdFormat.parse(sandDate);
 					

e9c8cfe

6c6bd10

src/main/java/itn/let/kakao/user/kakaoAt/web/KakaoAlimTalkSendController.java

--- src/main/java/itn/let/kakao/user/kakaoAt/web/KakaoAlimTalkSendController.java

+++ src/main/java/itn/let/kakao/user/kakaoAt/web/KakaoAlimTalkSendController.java


 import itn.let.kakao.kakaoComm.kakaoApi.KakaoApiTemplate;
 import itn.let.kakao.kakaoComm.kakaoApi.service.KakaoApiService;
 import itn.let.kakao.user.kakaoAt.service.KakaoAlimTalkService;
+import itn.let.mjo.mjocommon.MjonCommon;
+import itn.let.mjo.msg.service.MjonMsgVO;
 import itn.let.mjo.msgdata.service.MjonMsgDataService;
 import itn.let.mjo.msgdata.service.MjonMsgDataVO;
 import itn.let.mjo.msgdata.service.MjonMsgReturnVO;
+import itn.let.sym.site.service.EgovSiteManagerService;
 import itn.let.sym.site.service.JoinSettingVO;
+import itn.let.uss.umt.service.EgovUserManageService;
 import itn.let.uss.umt.service.MberManageVO;
+import itn.let.uss.umt.service.UserManageVO;
 
 /**
  * 

 
 	@Resource(name = "MjonMsgDataService")
 	private MjonMsgDataService mjonMsgDataService;
+
+	/** userManageService */
+	@Resource(name = "userManageService")
+	private EgovUserManageService userManageService;
 	
 	/** EgovMessageSource */
 	@Resource(name="egovMessageSource")
 	EgovMessageSource egovMessageSource;
+	
+	/** 사이트 설정 */ 
+	@Resource(name = "egovSiteManagerService")
+	EgovSiteManagerService egovSiteManagerService;	
 	
 	@Autowired
 	KakaoApiProfile kakaoApiProfile;

 		int resultSts = 0;			//발송결과 건수
 		int resultBlockSts = 0;		//수신거부 등록번호로 발송을 안한 건수
 		
+		LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
+		String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId());
 		try {
-
-			LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
-			String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId());
 			
 			if(userId == "") {
 				modelAndView.addObject("message", "로그인 후 이용이 가능합니다.");

 			}else {
 /** 카카오톡 전송 기본 설정 -------------------------------------------*/
 				kakaoVO.setSendType("AT");
+				kakaoVO.setMsgType("8");
 				kakaoVO.setUserId(userId);
+				
 			}
 			
 /** 전송금액 설정 --------------------------------------------------*/

 		modelAndView.addObject("result", "success");
 		modelAndView.addObject("resultSts", resultSts);
 		
+		
+/** 카카오톡 발송 내용 법인폰, 알림톡 결과 처리 --------------------------------------------------*/
+		try {
+			String adminSmsNoticeYn = "Y";
+			String spamStatus = kakaoVO.getAtSmishingYn(); // 스미싱 의심으로 체크된 고객 정보
+			
+			UserManageVO userManageVO = new UserManageVO();
+			userManageVO.setMberId(userId);
+			
+			if(!userId.equals("")) {
+				userManageVO = userManageService.selectAdminSmsNoticeYn(userManageVO);
+				adminSmsNoticeYn = userManageVO.getAdminSmsNoticeYn(); 
+			}
+			
+			//법인폰 알림 온 이거나 스미싱의심 문자인 경우 법인폰으로 발송
+			if(adminSmsNoticeYn.equals("Y") || spamStatus.equals("Y")) {
+				
+				if(spamStatus.equals("Y")) {
+					kakaoVO.setAtDelayYn("Y");
+				}
+				
+				// 법인폰 알람여부 체크
+				JoinSettingVO joinSettingVO = new JoinSettingVO();
+				joinSettingVO = egovSiteManagerService.selectAdminNotiDetail();
+				
+				// SLACK 체크
+				if (joinSettingVO != null && joinSettingVO.getSlackNoti().equals("Y")) {
+					//Slack으로 메세지 전송 처리
+					MjonCommon comm = new MjonCommon();
+//					comm.getAdminKakaoAtSandSlack(kakaoVO);
+				}
+			}
+			
+		} catch (Exception e) {
+			throw new Exception("++++++++++++++++++++++ getAdminPhoneSendMsgData Error !!! " + e);
+		}
+		
 		return modelAndView;
 	}
 }

e9c8cfe

6c6bd10

src/main/java/itn/let/mjo/mjocommon/MjonCommon.java

--- src/main/java/itn/let/mjo/mjocommon/MjonCommon.java

+++ src/main/java/itn/let/mjo/mjocommon/MjonCommon.java

...	...	@@ -12,6 +12,7 @@
12	12
13	13	import com.mysql.jdbc.StringUtils;
14	14
	15	+import itn.let.kakao.kakaoComm.KakaoVO;
15	16	import itn.let.mjo.msg.service.MjonMsgVO;
16	17
17	18	@Service("MjonCommon")
...	...	@@ -242,4 +243,63 @@
242	243	return mjonMsgVO;
243	244	}
244	245
	246	+ @SuppressWarnings("unchecked")
	247	+ public void getAdminKakaoAtSandSlack(KakaoVO kakaoVO) {
	248	+
	249	+ HttpClient client = new HttpClient();
	250	+ PostMethod post = new PostMethod(url);
	251	+ JSONObject json = new JSONObject();
	252	+ try {
	253	+
	254	+ String reserveYn = kakaoVO.getReserveYn();
	255	+ String atDelayYn = kakaoVO.getAtDelayYn();
	256	+ String smsTxt = kakaoVO.getTemplateContent();
	257	+ String reservSmsTxt = "";
	258	+ String smisingSmsTxt = "";
	259	+ //예약문자를 발송하는 경우 문자 내용 앞에 "[예약]" 표시되도록 처리
	260	+ if(reserveYn.equals("Y")) {
	261	+ reservSmsTxt = "[예약]" + smsTxt;
	262	+ smsTxt = reservSmsTxt;
	263	+ }else if(atDelayYn.equals("Y")) {
	264	+
	265	+ smisingSmsTxt = "[스미싱의심]" + smsTxt;
	266	+ smsTxt = smisingSmsTxt;
	267	+ }
	268	+
	269	+ String sandName = kakaoVO.getCallFrom();
	270	+ String userId = kakaoVO.getUserId();
	271	+ String msgType = "";
	272	+
	273	+ if(kakaoVO.getMsgType().equals("8")) {
	274	+ msgType = "[알림톡]";
	275	+ }else if(kakaoVO.getMsgType().equals("9")){
	276	+
	277	+ }
	278	+ sandName = "[" + userId + "]" + "[" + sandName + "]" + msgType;
	279	+
	280	+ json.put("channel", "mjon메시지");
	281	+ json.put("text", smsTxt);
	282	+ json.put("username", sandName);
	283	+
	284	+
	285	+ post.addParameter("payload", json.toString());
	286	+ // 처음에 utf-8로 content-type안넣어주니까 한글은 깨져서 content-type넣어줌
	287	+ post.setRequestHeader("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8");
	288	+ int responseCode = client.executeMethod(post);
	289	+ String response = post.getResponseBodyAsString();
	290	+ if (responseCode != HttpStatus.SC_OK) {
	291	+ System.out.println("Response: " + response);
	292	+ }
	293	+ } catch (IllegalArgumentException e) {
	294	+ System.out.println("IllegalArgumentException posting to Slack " + e);
	295	+ } catch (IOException e) {
	296	+ System.out.println("IOException posting to Slack " + e);
	297	+ } catch (Exception e) {
	298	+ System.out.println("Exception posting to Slack " + e);
	299	+ } finally {
	300	+ post.releaseConnection();
	301	+ }
	302	+
	303	+ }
	304	+
245	305	}

e9c8cfe

6c6bd10

src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java

--- src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java

+++ src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java


 	
 	private String atDelayYn = "N";			// 알림 30분 지연 처리 유무
 	private String atDelayCompleteYn;	// 알림톡 30분 지연 처리 완료 유무
-	private String atSmishingYn;		// 알림 지연처리
+	private String atSmishingYn;		// 알림톡 스메싱 여부
 	
 	private int totalCallCnt;	//수신자 전체 갯
 	

e9c8cfe

6c6bd10

src/main/java/itn/let/mjo/msg/service/impl/MjonMsgServiceImpl.java

--- src/main/java/itn/let/mjo/msg/service/impl/MjonMsgServiceImpl.java

+++ src/main/java/itn/let/mjo/msg/service/impl/MjonMsgServiceImpl.java


 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 

 import egovframework.rte.fdl.security.intercept.EgovReloadableFilterInvocationSecurityMetadataSource;
 import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper;
 import itn.com.cmm.LoginVO;
+import itn.com.cmm.util.MJUtil;
 import itn.com.utl.fcc.service.EgovDateUtil;
 import itn.let.mjo.msg.service.MjPhoneMemberVO;
 import itn.let.mjo.msg.service.MjonMapAddressVO;

 		int resultSts = 0;
 		
 		try {
+			boolean timeType = true;
 			
 			System.out.println("++++++++++++++++++ updateKakaoAtDelaySendRealTimeData groupId ::: "+mjonResvMsgVO.getMsgGroupId());
 			//삭제 문자 건수 MSG_SEQ 번호 받아오기

 			int size = resultMsgSeqList.size();
 			List<String> userDataList = new ArrayList<String>();
 			for(int i=0; i < size; i++) {
-				
 				userDataList.add(resultMsgSeqList.get(i).getUserData());
 				System.out.println(resultMsgSeqList.get(i).getUserData());
-				
 			}
-			
 			mjonResvMsgVO.setUserDataList(userDataList);
 			
-			//비즈뿌리오  딜레이문자 즉시발송 처리
-			resultSts = mjonReservMsgDAO.updateRealTimeBizMsgSeqListByMsgSeq(mjonResvMsgVO);
+			if(resultMsgSeqList.get(0).getReserveYn().equals("N")) {
+				// 즉시 발송시
+				//비즈뿌리오  딜레이문자 즉시발송 처리
+				resultSts = mjonReservMsgDAO.updateRealTimeBizMsgSeqListByMsgSeq(mjonResvMsgVO);
+				
+			}else { 
+				// 예약 발송시
+				//비즈뿌리오  딜레이문자 예약발송 처리
+				resultSts = mjonReservMsgDAO.updateReserveTimeBizMsgSeqListByMsgSeq(mjonResvMsgVO);
+			}
 			
 			System.out.println("++++++++++++++++++++++++++++++ resultSts ::: "+resultSts);
 			
-			//예약 취소 환불 처리
+			//발송 시간 수정(mj_msg_data, mj_msg_group_data)
 			if(resultSts > 0) {
-				
 				//그룹 데이터 정보 조회하기
 				MjonMsgVO mjonMsgVO = mjonMsgDAO.selectMsgGroupDataByGoupId(mjonResvMsgVO);
-				
 				//mj_msg_data 테이블 지연 문자 즉시발송 요청 값 수정
 				mjonMsgDAO.updateKakaoAtDelaySendRealTimeMsgDataFlag(mjonMsgVO);
-				
 				//mj_msg_group_data 테이블 즉시발송 요청 값 수정
 				mjonMsgDAO.updateKakaoAtDelaySendRealTimeMsgGroupDataFlag(mjonMsgVO);
-				
 			}
 			
 		} catch (Exception e) {

e9c8cfe

6c6bd10

src/main/java/itn/let/mjo/reservmsg/service/MjonResvMsgVO.java

--- src/main/java/itn/let/mjo/reservmsg/service/MjonResvMsgVO.java

+++ src/main/java/itn/let/mjo/reservmsg/service/MjonResvMsgVO.java


 	private String fileCnt;			//첨부 이미지 갯수 - 0: 장문, 1 이상은 그림문자
 	private String totMsgCnt;		//전체 전송문자 갯수
 	private String curState;		//전송 처리 결과값
+	private String reserveYn;		//예약 여부
 	private String reserveCYn;		//예약 취소 여부
 	private String filePath1;		//그림 이미지 1
 	private String filePath2;		//그림 이미지 2

 	public void setStrReqDate(String strReqDate) {
 		this.strReqDate = strReqDate;
 	}
-	
+	public String getReserveYn() {
+		return reserveYn;
+	}
+	public void setReserveYn(String reserveYn) {
+		this.reserveYn = reserveYn;
+	}
 }

e9c8cfe

6c6bd10

src/main/java/itn/let/mjo/reservmsg/service/impl/MjonReservMsgDAO.java

--- src/main/java/itn/let/mjo/reservmsg/service/impl/MjonReservMsgDAO.java

+++ src/main/java/itn/let/mjo/reservmsg/service/impl/MjonReservMsgDAO.java

...	...	@@ -277,4 +277,15 @@
277	277
278	278	return update("MjonReservMsgDAO.updateRealTimeJJB02MsgSeqListByMsgSeq", mjonResvMsgVO);
279	279	}
	280	+
	281	+ /**
	282	+ * @Method Name : updateReserveTimeBizMsgSeqListByMsgSeq
	283	+ * @작성일 : 2023. 07. 06.
	284	+ * @작성자 : WYD
	285	+ * @Method 설명 : 비즈뿌리오 지연처리 문자 예약 발송
	286	+ */
	287	+ public int updateReserveTimeBizMsgSeqListByMsgSeq(MjonResvMsgVO mjonResvMsgVO) {
	288	+
	289	+ return update("MjonReservMsgDAO.updateReserveTimeBizMsgSeqListByMsgSeq", mjonResvMsgVO);
	290	+ }
280	291	}

e9c8cfe

6c6bd10

src/main/resources/egovframework/sqlmap/let/kakao/MjonKakaoATData_SQL_mysql.xml

--- src/main/resources/egovframework/sqlmap/let/kakao/MjonKakaoATData_SQL_mysql.xml

+++ src/main/resources/egovframework/sqlmap/let/kakao/MjonKakaoATData_SQL_mysql.xml


         M2.yellowId ,
         M2.userNm ,
         M2.atSmishingYn ,
+        M2.atDelayCompleteYn,
+        M2.atDelayYn,
 		( SELECT COUNT(0) 
 			FROM    MJ_MSG_DATA C
 			WHERE   C.DEL_FLAG     = 'N'

 	        MSG_NOTICETALK_TMP_KEY               AS msgNoticetalkTmpKey ,
 	        MKPI.YELLOW_ID                       AS yellowId ,
 	        LTM.MBER_NM                          AS userNm ,
-	        LTM.AT_SMISHING_YN					 AS atSmishingYn,
+	        LTM.AT_SMISHING_YN						AS atSmishingYn,
 			BIZ_UMID                              AS bizUmid,
 			BL.CALL_STATUS                        AS callStatus,
-			M.BIZ_KAKAO_RESEND_YN                 AS bizKakaoResendYn
-		FROM ( 
-				SELECT MG.USER_ID ,
-				MG.MSG_GROUP_ID ,
-				MG.MSG_GROUP_CNT ,
-				MG.SMS_TXT ,
-				MG.SUBJECT ,
-				MG.REGDATE ,
-				MG.REQ_DATE ,
-				MD.RSLT_DATE ,
-				MG.CALL_FROM ,
-				MG.TOT_PRICE ,
-				MG.EACH_PRICE ,
-				MG.DEL_FLAG ,
-				MG.MSG_TYPE ,
-				MG.FILE_CNT ,
-				MG.AGENT_CODE ,
-				MG.RESERVE_YN ,
-				MG.RESERVE_C_YN ,
-				MG.CANCELDATE ,
-				MD.MSG_SEQ ,
-				MD.CALL_TO ,
-				MD.CUR_STATE ,
-				MD.RSLT_CODE ,
-				MD.RSLT_CODE2 ,
-				CASE
+			M.BIZ_KAKAO_RESEND_YN                 AS bizKakaoResendYn,
+			M.AT_DELAY_COMPLETE_YN					AS atDelayCompleteYn,
+			M.AT_DELAY_YN							AS atDelayYn
+		FROM
+			(SELECT
+				MG.USER_ID
+				, MG.MSG_GROUP_ID
+				, MG.MSG_GROUP_CNT
+				, MG.SMS_TXT
+				, MG.SUBJECT
+				, MG.REGDATE
+				, MG.REQ_DATE
+				, MD.RSLT_DATE
+				, MG.CALL_FROM
+				, MG.TOT_PRICE
+				, MG.EACH_PRICE
+				, MG.DEL_FLAG
+				, MG.MSG_TYPE
+				, MG.FILE_CNT
+				, MG.AGENT_CODE
+				, MG.RESERVE_YN
+				, MG.RESERVE_C_YN
+				, MG.CANCELDATE
+				, MD.MSG_SEQ
+				, MD.CALL_TO
+				, MD.CUR_STATE
+				, MD.RSLT_CODE
+				, MD.RSLT_CODE2
+				, CASE
 					 WHEN MG.MSG_TYPE = '8'
 					 THEN '알림톡'
 					 WHEN MG.MSG_TYPE = '9'
 					 THEN '친구톡'
-				END msgTypeName ,
-				CASE
+				END msgTypeName
+				, CASE
 					WHEN MG.MSG_TYPE = '8'
 					THEN '1'
 					ELSE '2'
-				END orderByCode , 
-				(
+				END orderByCode
+				, (
 					CASE
 						WHEN MD.RSLT_CODE = '7000'
 						THEN 'S'

 						THEN 'W'
 						ELSE 'F'
 					END 
-				) AS result ,
-				MSG_NOTICETALK_SENDER_KEY ,
-				MSG_NOTICETALK_TMP_KEY,
-				MD.BIZ_UMID,
-				MD.BIZ_KAKAO_RESEND_YN
-			FROM    MJ_MSG_DATA MD ,
-					MJ_MSG_GROUP_DATA MG
-			WHERE	MD.MSG_GROUP_ID = MG.MSG_GROUP_ID
+				) AS result
+				, MSG_NOTICETALK_SENDER_KEY
+				, MSG_NOTICETALK_TMP_KEY
+				, MD.BIZ_UMID
+				, MD.BIZ_KAKAO_RESEND_YN
+				, MG.AT_DELAY_COMPLETE_YN
+				, MG.AT_DELAY_YN
+			FROM
+				MJ_MSG_DATA MD
+				, MJ_MSG_GROUP_DATA MG
+			WHERE 1=1
+				AND MD.MSG_GROUP_ID = MG.MSG_GROUP_ID
 				AND IFNULL(MG.DEL_FLAG, 'N') = 'N'
 				AND MD.DEL_FLAG = 'N'
 				<!-- JSPark 2023.03.24 알림톡 전송완료 목록은 (즉시 + 예약 발송완료) 노출 -->
-				<![CDATA[ AND MG.REQ_DATE <= NOW() ]]>
+				<![CDATA[
+				AND MG.REQ_DATE <= DATE_ADD(NOW(), INTERVAL 60 MINUTE) 
+				]]>
 				<isNotEmpty property="userId">
 				AND MG.USER_ID = #userId#
 				</isNotEmpty>

 			M2.msgNoticetalkTmpKey ,
 			M2.yellowId ,
 			M2.userNm ,
+			M2.atSmishingYn,
+			M2.atDelayCompleteYn,
+			M2.atDelayYn,
 			( SELECT COUNT(0) 
 				FROM    MJ_MSG_DATA C
 				WHERE   C.DEL_FLAG     = 'N'

 				orderByCode                           AS orderByCode ,
 				RESULT                                AS msgResult ,
 				MSG_NOTICETALK_SENDER_KEY            AS msgNoticetalkSenderKey ,
-		        MSG_NOTICETALK_TMP_KEY               AS msgNoticetalkTmpKey ,
-		        MKPI.YELLOW_ID                       AS yellowId ,
-		        LTM.MBER_NM                          AS userNm ,
+				MSG_NOTICETALK_TMP_KEY               AS msgNoticetalkTmpKey ,
+				MKPI.YELLOW_ID                       AS yellowId ,
+				LTM.MBER_NM                          AS userNm ,
+				LTM.AT_SMISHING_YN					AS atSmishingYn,
 				BIZ_UMID                              AS bizUmid,
 				BL.CALL_STATUS                        AS callStatus,
-				M.BIZ_KAKAO_RESEND_YN                 AS bizKakaoResendYn
+				M.BIZ_KAKAO_RESEND_YN                 AS bizKakaoResendYn,
+				M.AT_DELAY_COMPLETE_YN					AS atDelayCompleteYn,
+				M.AT_DELAY_YN							AS atDelayYn
 			FROM ( 
 					SELECT MG.USER_ID ,
 					MG.MSG_GROUP_ID ,

 							THEN 'W'
 							ELSE 'F'
 						END 
-					) AS result ,
-					MSG_NOTICETALK_SENDER_KEY ,
-					MSG_NOTICETALK_TMP_KEY,
-					MD.BIZ_UMID,
-					MD.BIZ_KAKAO_RESEND_YN
+					) AS result
+					, MSG_NOTICETALK_SENDER_KEY
+					, MSG_NOTICETALK_TMP_KEY
+					, MD.BIZ_UMID
+					, MD.BIZ_KAKAO_RESEND_YN
+					, MG.AT_DELAY_COMPLETE_YN
+					, MG.AT_DELAY_YN
 				FROM    MJ_MSG_DATA MD ,
 						MJ_MSG_GROUP_DATA MG
 				WHERE	MD.MSG_GROUP_ID = MG.MSG_GROUP_ID
 					AND IFNULL(MG.DEL_FLAG, 'N') = 'N'
 					AND MD.DEL_FLAG = 'N'
+					
 				<isNotEmpty property="userId">
 					AND MG.USER_ID = #userId#
 				</isNotEmpty>

 				, B.SMS_TXT
 				, B.SUBJECT
 				, B.REGDATE
-				, B.REQ_DATE
+				, A.REQ_DATE
 				, A.RSLT_DATE
 				, B.CALL_FROM
 				, B.TOT_PRICE

e9c8cfe

6c6bd10

src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml

--- src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml

+++ src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml


 	
 	<select id="mjonMsgDAO.selectMsgGroupDataByGoupId" parameterClass="mjonResvMsgVO" resultClass="mjonMsgVO">
 		
-		SELECT MSG_GROUP_ID AS msgGroupId,
-		       USER_ID AS userId,
-		       SMS_TXT AS smsTxt,
-		       EACH_PRICE AS eachPrice,
-		       TOT_PRICE AS totPrice,
-		       MSG_GROUP_CNT AS msgGroupCnt
-		FROM   MJ_MSG_GROUP_DATA
-		WHERE  USER_ID      = #userId#
-		AND    MSG_GROUP_ID = #msgGroupId#
+		SELECT
+			MSG_GROUP_ID		AS msgGroupId
+			, USER_ID			AS userId
+			, SMS_TXT			AS smsTxt
+			, EACH_PRICE		AS eachPrice
+			, TOT_PRICE			AS totPrice
+			, MSG_GROUP_CNT		AS msgGroupCnt
+		FROM
+			MJ_MSG_GROUP_DATA
+		WHERE 1=1
+			AND USER_ID      = #userId#
+			AND MSG_GROUP_ID = #msgGroupId#
 		ORDER BY MSG_GROUP_ID DESC
 		LIMIT 1
 	

 	
 	<select id="mjonMsgDAO.selectMsgGroupDataReqDateList" parameterClass="mjonMsgResvVO" resultClass="mjonMsgResvVO">
 		
-		SELECT   DATE_FORMAT(REQ_DATE, '%Y-%m-%d %T' ) AS strReqDate
-		FROM     MJ_MSG_GROUP_DATA
+		SELECT
+			DATE_FORMAT(REQ_DATE, '%Y-%m-%d %T' ) AS strReqDate
+		FROM
+			MJ_MSG_GROUP_DATA
 		WHERE 1=1 
-		AND USER_ID      = #userId#
+			AND USER_ID      = #userId#
 		<iterate prepend="AND MSG_GROUP_ID IN" open="(" close=")" conjunction="," property="msgGroupIdList">
 			#msgGroupIdList[]#
 		</iterate>

 	</update>
 	
 	<update id="mjonMsgDAO.updateKakaoAtDelaySendRealTimeMsgDataFlag" parameterClass="mjonMsgVO">
-		
 		UPDATE
 			MJ_MSG_DATA
 		SET
-			REQ_DATE = NOW()
+			REQ_DATE =
+			<![CDATA[
+			CASE 
+				WHEN TIMESTAMPDIFF(MINUTE, NOW(), REQ_DATE) < 0
+				THEN REQ_DATE
+				WHEN TIMESTAMPDIFF(MINUTE, NOW(), REQ_DATE) >= 30 
+				THEN DATE_ADD(REQ_DATE, INTERVAL -30 MINUTE)
+				ELSE DATE_ADD(REQ_DATE, INTERVAL -(TIMESTAMPDIFF(MINUTE, NOW(), REQ_DATE)) MINUTE)
+			END
+			]]>
 		WHERE 1=1
 			AND USER_ID = #userId#
 			AND MSG_GROUP_ID = #msgGroupId#
-	
 	</update>
 	
 	<update id="mjonMsgDAO.updateKakaoAtDelaySendRealTimeMsgGroupDataFlag" parameterClass="mjonMsgVO">
-		
 		UPDATE
 			MJ_MSG_GROUP_DATA
 		SET
-			REQ_DATE = NOW()
+			REQ_DATE =
+			<![CDATA[
+			CASE
+				WHEN TIMESTAMPDIFF(MINUTE, NOW(), REQ_DATE) < 0
+				THEN REQ_DATE
+				WHEN TIMESTAMPDIFF(MINUTE, NOW(), REQ_DATE) >= 30 
+				THEN DATE_ADD(REQ_DATE, INTERVAL -30 MINUTE)
+				ELSE DATE_ADD(REQ_DATE, INTERVAL -(TIMESTAMPDIFF(MINUTE, NOW(), REQ_DATE)) MINUTE)
+			END
+			]]>
 			, AT_DELAY_COMPLETE_YN = 'Y'
 		WHERE 1=1
 			AND USER_ID = #userId#
 			AND MSG_GROUP_ID = #msgGroupId#
-	
 	</update>
 	
 </sqlMap>

e9c8cfe

6c6bd10

src/main/resources/egovframework/sqlmap/let/msg/MjonMsgResv_SQL_mysql.xml

--- src/main/resources/egovframework/sqlmap/let/msg/MjonMsgResv_SQL_mysql.xml

+++ src/main/resources/egovframework/sqlmap/let/msg/MjonMsgResv_SQL_mysql.xml


 	</select>
 	
 	<select id="MjonReservMsgDAO.selectMsgSeqListByGroupId" parameterClass="mjonMsgResvVO" resultClass="mjonMsgResvVO">
-		
-		SELECT USERDATA AS userData
-		FROM   MJ_MSG_DATA
-		WHERE  USER_ID      = #userId#
-		AND    MSG_GROUP_ID = #msgGroupId#
-	
+		SELECT
+			A.USERDATA		AS userData
+			, DATE_FORMAT(A.REQ_DATE, '%Y-%m-%d %T' ) AS reqdate
+			, B.RESERVE_YN	AS reserveYn
+		FROM
+			MJ_MSG_DATA A
+			, MJ_MSG_GROUP_DATA B
+		WHERE A.MSG_GROUP_ID	= B.MSG_GROUP_ID
+			AND A.USER_ID		= #userId#
+			AND A.MSG_GROUP_ID	= #msgGroupId#
+		ORDER BY A.REQ_DATE ASC
 	</select>
 	
 	<select id="MjonReservMsgDAO.selectMjonMsgGroupData" parameterClass="mjonMsgResvVO" resultClass="mjonMsgVO">

 	
 	</update>
 	
-	
 	<update id="MjonReservMsgDAO.updateRealTimeIVTMsgSeqListByMsgSeq" parameterClass="mjonMsgResvVO">
 		
 		UPDATE SMSQ_SEND

 	
 	</update>
 	
+	<update id="MjonReservMsgDAO.updateReserveTimeBizMsgSeqListByMsgSeq" parameterClass="mjonMsgResvVO">
+		UPDATE
+			BIZ_MSG
+		SET
+			REQUEST_TIME = 
+			<![CDATA[
+			CASE 
+				WHEN TIMESTAMPDIFF(MINUTE, NOW(), REQUEST_TIME) < 0
+				THEN REQUEST_TIME
+				WHEN TIMESTAMPDIFF(MINUTE, NOW(), REQUEST_TIME) >= 30 
+				THEN DATE_ADD(REQUEST_TIME, INTERVAL -30 MINUTE)
+				ELSE DATE_ADD(REQUEST_TIME, INTERVAL -(TIMESTAMPDIFF(MINUTE, NOW(), REQUEST_TIME)) MINUTE)
+			END
+			]]>
+		WHERE 1=1 
+		<iterate prepend="AND USER_KEY IN" open="(" close=")" conjunction="," property="userDataList">
+			#userDataList[]#
+		</iterate>
+	
+	</update>
+	
 </sqlMap>  
 
 

e9c8cfe

6c6bd10

src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Mysql.xml

--- src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Mysql.xml

+++ src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Mysql.xml


     </select>
 	
     <select id="userManageDAO.selectAdminSmsNoticeYn" parameterClass="userVO" resultClass="userVO">
-	  	SELECT 
-    		ADMIN_SMS_NOTICE_YN AS adminSmsNoticeYn,
-    		PRE_PAYMENT_YN	AS prePaymentYn,
-    		SMISHING_YN AS smishingYn,
-			AUTO_CASH AS autoCash,
-			IFNULL(BLINE_CODE, 'N') AS blineCode,
-			IFNULL(RECOMMEND_ID, '') AS recommendId
-		FROM   LETTNGNRLMBER
-		WHERE  MBER_ID = #mberId#
+		SELECT 
+			ADMIN_SMS_NOTICE_YN 		AS adminSmsNoticeYn
+			,PRE_PAYMENT_YN				AS prePaymentYn
+			,SMISHING_YN				AS smishingYn
+			,AUTO_CASH					AS autoCash
+			,IFNULL(BLINE_CODE, 'N')	AS blineCode
+			,IFNULL(RECOMMEND_ID, '')	AS recommendId
+		FROM
+			LETTNGNRLMBER
+		WHERE
+			MBER_ID = #mberId#
     </select> 
 
 	<update id="userManageDAO.updateUserAdminSmsNoticeYn" parameterClass="userVO">

e9c8cfe

6c6bd10

src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/ReserveKakaoATDetailList.jsp

--- src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/ReserveKakaoATDetailList.jsp

+++ src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/ReserveKakaoATDetailList.jsp


 	<input type="hidden" name="detailType" value="<c:out value="${searchVO.detailType}" />" />
 	<input type="hidden" name="ntceBgnde" id="ntceBgnde"  value="">
 	<input type="hidden" name="ntceEndde" id="ntceEndde"  value="">
+	<input type="hidden" name="userId" id="userId" value="<c:out value="${searchVO.userId}" />" />
 	
 	<div class="contWrap">
 		<div class="pageTitle">

e9c8cfe

6c6bd10

src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/ReserveKakaoATList.jsp

--- src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/ReserveKakaoATList.jsp

+++ src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/ReserveKakaoATList.jsp


     if(checkedIds.length > 0) {
     	var msg = "";
 		if(flag == 'on') {
-			document.listForm.smishingYn.value='Y';
+			document.listForm.atSmishingYn.value='Y';
 			msg = "선택하신 사용자의 스미싱의심을 On 하시겠습니까?";
 		} else {
-			document.listForm.smishingYn.value='N';
+			document.listForm.atSmishingYn.value='N';
 			msg = "선택하신 사용자의 스미싱의심을 Off 하시겠습니까?";
 		}
         if(confirm(msg)){

 	<input type="hidden" name="ntceEndde" id="ntceEndde"  value="">
 	<input type="hidden" name="adminSmsNoticeYn" value=""/>
 	<input name="checkedIdForDel" type="hidden" />
-	<input type="hidden" name="smishingYn" value=""/>
+	<input type="hidden" name="atSmishingYn" value=""/>
 	
 	<div class="contWrap">
 		<div class="pageTitle">

 						<col style="width: 5%">
 						<col style="width: 13%">
 						<col style="width: 13%">
-						<%-- <col style="width: 10%"> --%>
 						<col style="width: 10%">
-						<%-- <col style="width: 10%"> --%>
+						<col style="width: 10%">
 						<col style="width: 10%">
 						<col style="width: 5%">
 						<col style="width: auto">

 							<th>번호<input type="button" class="sort sortBtn" id="sort_msgGroupId"></th>
 							<th>아이디<input type="button" class="sort sortBtn" id="sort_userId"></th>
 							<th>채널ID<input type="button" class="sort sortBtn" id="sort_yellowId"></th>
-							<!-- <th>qkf<input type="button" class="sort sortBtn" id="sort_callFrom"></th> -->
 							<th>발송건수<input type="button" class="sort sortBtn" id="sort_msgGroupCnt"></th>
-							<!-- <th>스미싱의심</th> -->
+							<th>스미싱의심</th>
 							<th>요청시간<input type="button" class="sort sortBtn" id="sort_reqDate"></th>
 							<th>예약<input type="button" class="sort sortBtn" id="sort_reserveYn"></th>
 							<th>내용<input type="button" class="sort sortBtn" id="sort_smsTxt"></th>
 							<th>타입<input type="button" class="sort sortBtn" id="sort_msgType"></th>
-							<!-- <th>전송사<input type="button" class="sort sortBtn" id="sort_agentCodeTxt"></th> -->
-							<!-- <th>통신사<input type="button" class="sort sortBtn" id="sort_rsltNet"></th> -->
 						</tr>
 					</thead>
 					<tbody>

 								<input name="checkField" id="<c:out value="${result.userId}"/>" title="Check <c:out value="${status.count}"/>" type="checkbox"/><label for="<c:out value="${result.userId}"/>"></label>
 								<input name="checkId" type="hidden" class="${result.userId}" value="<c:out value='${result.userId}'/>:<c:out value='${result.userId}'/>"/>								
 							</td>						
-							<td>
+							<td <c:if test="${result.atSmishingYn eq 'Y'}">class="smishing"</c:if>>
 								<c:if test="${searchVO.searchSortOrd eq 'desc' }">
 		                			<c:out value="${ ( paginationInfo.totalRecordCount - ((paginationInfo.currentPageNo -1)*paginationInfo.recordCountPerPage) ) - status.index }"/>
 			                	</c:if>

 									<c:out value="${(paginationInfo.currentPageNo - 1) * paginationInfo.recordCountPerPage + status.count}"/>                   		
 			                	</c:if>
 							</td>
-							<td>
+							<td <c:if test="${result.atSmishingYn eq 'Y'}">class="smishing"</c:if>>
 								<div class="id_box  <c:if test='${result.vipYn eq "Y" }'>vip</c:if>">
 									<a href="#" onclick="javascript:fnSelectMber('<c:out value="${result.userId}"/>'); return false;">
 										<c:out value="${result.userId}"/>(<c:out value="${result.userNm}"/>)
 									</a>
 								</div>
 							</td>
-							
-							<td onclick="fn_detail_list('<c:out value="${result.msgGroupId}"/>', '<c:out value="${result.userId}"/>'); return false;" style="cursor:pointer;">
-								<c:out value="${result.yellowId}"/>							
-		                    </td>				
-							
-							<%-- <td onclick="fn_detail_list('${result.msgGroupId}'); return false;" <c:if test="${result.smishingYn eq 'Y'}">class="smishing" style="cursor:pointer;"</c:if><c:if test="${result.smishingYn eq 'N'}">style="cursor:pointer;"</c:if>>
-								<c:out value="${result.callFrom}"/>
-							</td> --%>
-								
-							<td  onclick="fn_detail_list('<c:out value="${result.msgGroupId}"/>', '<c:out value="${result.userId}"/>'); return false;" style="cursor:pointer;line-height:30px;text-align:right;">
+							<td onclick="fn_detail_list('<c:out value="${result.msgGroupId}"/>', '<c:out value="${result.userId}"/>'); return false;" style="cursor:pointer;" <c:if test="${result.atSmishingYn eq 'Y'}">class="smishing"</c:if>>
+								<c:out value="${result.yellowId}"/>
+							</td>
+							<td  onclick="fn_detail_list('<c:out value="${result.msgGroupId}"/>', '<c:out value="${result.userId}"/>'); return false;" style="cursor:pointer;line-height:30px;text-align:right;"  <c:if test="${result.atSmishingYn eq 'Y'}">class="smishing"</c:if>>
 								<c:choose>
 									<c:when test="${result.successCount > 0}">
 										<c:out value="${result.msgGroupCnt}"/>(<fmt:formatNumber value="${(result.successCount / result.msgGroupCnt) * 100}" pattern="#,###" />%)

 										<span style="color: #0000FF;">
 											<c:out value="${result.msgGroupCnt}"/>(<fmt:formatNumber value="${(result.successCount / result.msgGroupCnt) * 100}" pattern="#,###" />%)
 											<c:if test="${result.msgGroupCnt eq result.callRejectionCount && result.callbackYn eq 'N' && result.userCallbackYn eq 'N' }">
-					                			<%-- <input type="button" style="margin-left:3px;margin-right:0;vertical-align:top;" class="btnType1" onclick="fn_sendMsgData('<c:out value="${result.msgGroupId}"/>','<c:out value="${result.callFrom}"/>','<c:out value="${result.userId}"/>');" value="문자" /> --%>	
-						                	</c:if>
+												<%-- <input type="button" style="margin-left:3px;margin-right:0;vertical-align:top;" class="btnType1" onclick="fn_sendMsgData('<c:out value="${result.msgGroupId}"/>','<c:out value="${result.callFrom}"/>','<c:out value="${result.userId}"/>');" value="문자" /> --%>	
+											</c:if>
 											<c:if test="${result.callbackYn eq 'Y' }">
-					                			<span style="color: #0000FF;" title="번호도용 문자차단 안내문자 발송완료">안내완료</span>
-						                	</c:if>						                												
+												<span style="color: #0000FF;" title="번호도용 문자차단 안내문자 발송완료">안내완료</span>
+											</c:if>
 										</span>
 									</c:otherwise>
-								</c:choose>								
+								</c:choose>
 							</td>
-							<td onclick="fn_detail_list('<c:out value="${result.msgGroupId}"/>', '<c:out value="${result.userId}"/>'); return false;" style="cursor:pointer;" title="<c:out value="${result.rsltDate}"/>">
+							<td <c:if test="${result.atSmishingYn eq 'Y'}">class="smishing"</c:if>>
+								<c:choose>
+									<c:when test="${result.atDelayYn eq 'Y'}">
+										<c:choose>
+											<c:when test="${result.atDelayCompleteYn eq 'Y' && not empty result.cancelDate}">
+												<span style="color: #0000FF;">
+													<c:if test="${result.smishingYn eq 'Y'}">온</c:if><c:if test="${result.smishingYn eq 'N'}">오프</c:if>[이용정지]
+													<span style="overflow:hidden;text-overflow:ellipsis;white-space:nowrap;display:block;margin-top:3px;" title="<c:out value="${result.cancelDate}"/>">
+														<fmt:parseDate value="${result.cancelDate}" var="cancelDateValue" pattern="yyyy-MM-dd HH:mm"/>
+														<fmt:formatDate value="${cancelDateValue}" pattern="MM-dd HH:mm"/>														
+													</span>
+												</span>
+											</c:when>
+											<c:when test="${result.atDelayCompleteYn eq 'N'}">
+												<c:if test="${result.atSmishingYn eq 'Y'}">온</c:if>
+												<c:if test="${result.atSmishingYn eq 'N'}">오프</c:if>[미처리]
+											</c:when>
+											<c:otherwise>
+												<span style="color: #0000FF;">
+													<c:if test="${result.atSmishingYn eq 'Y'}">온</c:if>
+													<c:if test="${result.atSmishingYn eq 'N'}">오프</c:if>[승인]
+												</span>
+											</c:otherwise>
+										</c:choose>
+									</c:when>
+									<c:otherwise>
+										-
+									</c:otherwise>
+								</c:choose>
+							</td>
+							<td onclick="fn_detail_list('<c:out value="${result.msgGroupId}"/>', '<c:out value="${result.userId}"/>'); return false;" style="cursor:pointer;" title="<c:out value="${result.rsltDate}"/>" <c:if test="${result.atSmishingYn eq 'Y'}">class="smishing"</c:if>>
 								<fmt:parseDate value="${result.reqDate}" var="reqDateValue" pattern="yyyy-MM-dd HH:mm"/>
-								<fmt:formatDate value="${reqDateValue}" pattern="MM-dd HH:mm"/>								
+								<fmt:formatDate value="${reqDateValue}" pattern="MM-dd HH:mm"/>
 							</td>
-							<td onclick="fn_detail_list('${result.msgGroupId}'); return false;" style="cursor:pointer;">
+							<td onclick="fn_detail_list('${result.msgGroupId}'); return false;" style="cursor:pointer;" <c:if test="${result.atSmishingYn eq 'Y'}">class="smishing"</c:if>>
 								<c:choose>
 									<c:when test="${result.reserveYn eq 'Y'}">
 										예약

 									</c:otherwise>
 								</c:choose>
 							</td>							
-							<td class="sms_detail left" onclick="fn_detail_list('<c:out value="${result.msgGroupId}"/>', '<c:out value="${result.userId}"/>'); return false;" style="cursor:pointer;">
+							<td class="sms_detail left <c:if test="${result.atSmishingYn eq 'Y'}">smishing</c:if>" onclick="fn_detail_list('<c:out value="${result.msgGroupId}"/>', '<c:out value="${result.userId}"/>'); return false;" style="cursor:pointer;">
 								<p><c:out value="${result.smsTxt}"/></p>
 								<div class="sms_detail_hover">
 									<c:out value="${fn:replace(fn:replace(result.smsTxt, newLineChar, '<br/>'), newLineChar2, '<br/>')}" escapeXml="false"/>
 								</div>
 							</td>
-							<td onclick="fn_detail_list('<c:out value="${result.msgGroupId}"/>', '<c:out value="${result.userId}"/>'); return false;" style="cursor:pointer;">
+							<td onclick="fn_detail_list('<c:out value="${result.msgGroupId}"/>', '<c:out value="${result.userId}"/>'); return false;" style="cursor:pointer;" <c:if test="${result.atSmishingYn eq 'Y'}">class="smishing"</c:if>>
 								<c:out value="${result.msgTypeName}"/>
 							</td>
-							<%-- <td><c:out value="${result.conectMthdTxt}"/></td> --%>
-							<%-- <td <c:if test="${result.smishingYn eq 'Y'}">class="smishing"</c:if>>
-								<c:out value="${result.agentCodeTxt}"/>
-							</td> --%>
-							<%-- <td><c:out value="${result.rsltNet}"/></td> --%>
 						</tr>
 						</c:forEach>
 						<c:if test="${empty resultList}">
-		         			<tr><td colspan="8"><spring:message code="common.nodata.msg" /></td></tr>
-		         		</c:if>    
+							<tr><td colspan="10"><spring:message code="common.nodata.msg" /></td></tr>
+						</c:if>
 					</tbody>
 				</table>
 			</div>

e9c8cfe

6c6bd10

src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/SendKakaoATList.jsp

--- src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/SendKakaoATList.jsp

+++ src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/SendKakaoATList.jsp


 						<col style="width: 13%">
 						<%-- <col style="width: 10%"> --%>
 						<col style="width: 10%">
-						<%-- <col style="width: 10%"> --%>
+						<col style="width: 10%">
 						<col style="width: 10%">
 						<col style="width: 5%">
 						<col style="width: auto">

 							<th>번호<input type="button" class="sort sortBtn" id="sort_msgGroupId"></th>
 							<th>아이디<input type="button" class="sort sortBtn" id="sort_userId"></th>
 							<th>채널ID<input type="button" class="sort sortBtn" id="sort_yellowId"></th>
-							<!-- <th>qkf<input type="button" class="sort sortBtn" id="sort_callFrom"></th> -->
 							<th>발송건수<input type="button" class="sort sortBtn" id="sort_msgGroupCnt"></th>
-							<!-- <th>스미싱의심</th> -->
+							<th>스미싱의심</th>
 							<th>요청시간<input type="button" class="sort sortBtn" id="sort_reqDate"></th>
 							<th>예약<input type="button" class="sort sortBtn" id="sort_reserveYn"></th>
 							<th>내용<input type="button" class="sort sortBtn" id="sort_smsTxt"></th>
 							<th>타입<input type="button" class="sort sortBtn" id="sort_msgType"></th>
-							<!-- <th>전송사<input type="button" class="sort sortBtn" id="sort_agentCodeTxt"></th> -->
-							<!-- <th>통신사<input type="button" class="sort sortBtn" id="sort_rsltNet"></th> -->
 						</tr>
 					</thead>
 					<tbody>

 								<input name="checkField" id="<c:out value="${result.userId}"/>" title="Check <c:out value="${status.count}"/>" type="checkbox"/><label for="<c:out value="${result.userId}"/>"></label>
 								<input name="checkId" type="hidden" class="${result.userId}" value="<c:out value='${result.userId}'/>:<c:out value='${result.userId}'/>"/>								
 							</td>						
-							<td>
+							<td  <c:if test="${result.atSmishingYn eq 'Y'}">class="smishing"</c:if>>
 								<c:if test="${searchVO.searchSortOrd eq 'desc' }">
 		                			<c:out value="${ ( paginationInfo.totalRecordCount - ((paginationInfo.currentPageNo -1)*paginationInfo.recordCountPerPage) ) - status.index }"/>
 			                	</c:if>

 									<c:out value="${(paginationInfo.currentPageNo - 1) * paginationInfo.recordCountPerPage + status.count}"/>                   		
 			                	</c:if>
 							</td>
-							<td>
+							<td <c:if test="${result.atSmishingYn eq 'Y'}">class="smishing"</c:if>>
 								<div class="id_box  <c:if test='${result.vipYn eq "Y" }'>vip</c:if>">
 									<a href="#" onclick="javascript:fnSelectMber('<c:out value="${result.userId}"/>'); return false;">
 										<c:out value="${result.userId}"/>(<c:out value="${result.userNm}"/>)
 									</a>
 								</div>
 							</td>
-							
-							<td onclick="fn_detail_list('<c:out value="${result.msgGroupId}"/>', '<c:out value="${result.userId}"/>'); return false;" style="cursor:pointer;">
+							<td onclick="fn_detail_list('<c:out value="${result.msgGroupId}"/>', '<c:out value="${result.userId}"/>'); return false;" <c:if test="${result.atSmishingYn eq 'Y'}">class="smishing"</c:if>>
 								<c:out value="${result.yellowId}"/>							
-		                    </td>				
-							
-							<%-- <td onclick="fn_detail_list('${result.msgGroupId}'); return false;" <c:if test="${result.atSmishingYn eq 'Y'}">class="atSmishingYn" style="cursor:pointer;"</c:if><c:if test="${result.atSmishingYn eq 'N'}">style="cursor:pointer;"</c:if>>
-								<c:out value="${result.callFrom}"/>
-							</td> --%>
-								
-							<td  onclick="fn_detail_list('<c:out value="${result.msgGroupId}"/>', '<c:out value="${result.userId}"/>'); return false;" style="cursor:pointer;line-height:30px;text-align:right;">
+							</td>
+							<td onclick="fn_detail_list('<c:out value="${result.msgGroupId}"/>', '<c:out value="${result.userId}"/>'); return false;" <c:if test="${result.atSmishingYn eq 'Y'}">class="smishing"</c:if>>
 								<c:choose>
 									<c:when test="${result.successCount > 0}">
 										<c:out value="${result.msgGroupCnt}"/>(<fmt:formatNumber value="${(result.successCount / result.msgGroupCnt) * 100}" pattern="#,###" />%)

 										<span style="color: #0000FF;">
 											<c:out value="${result.msgGroupCnt}"/>(<fmt:formatNumber value="${(result.successCount / result.msgGroupCnt) * 100}" pattern="#,###" />%)
 											<c:if test="${result.msgGroupCnt eq result.callRejectionCount && result.callbackYn eq 'N' && result.userCallbackYn eq 'N' }">
-					                			<%-- <input type="button" style="margin-left:3px;margin-right:0;vertical-align:top;" class="btnType1" onclick="fn_sendMsgData('<c:out value="${result.msgGroupId}"/>','<c:out value="${result.callFrom}"/>','<c:out value="${result.userId}"/>');" value="문자" /> --%>	
-						                	</c:if>
+	
+											</c:if>
 											<c:if test="${result.callbackYn eq 'Y' }">
-					                			<span style="color: #0000FF;" title="번호도용 문자차단 안내문자 발송완료">안내완료</span>
-						                	</c:if>						                												
+												<span style="color: #0000FF;" title="번호도용 문자차단 안내문자 발송완료">안내완료</span>
+											</c:if>
 										</span>
 									</c:otherwise>
 								</c:choose>								
 							</td>
-							<td onclick="fn_detail_list('<c:out value="${result.msgGroupId}"/>', '<c:out value="${result.userId}"/>'); return false;" style="cursor:pointer;" title="<c:out value="${result.rsltDate}"/>">
+							<td <c:if test="${result.atSmishingYn eq 'Y'}">class="smishing"</c:if>>
+								<c:choose>
+									<c:when test="${result.atDelayYn eq 'Y'}">
+										<c:choose>
+											<c:when test="${result.atDelayCompleteYn eq 'Y' && not empty result.cancelDate}">
+												<span style="color: #0000FF;">
+													<c:if test="${result.atSmishingYn eq 'Y'}">온</c:if>
+													<c:if test="${result.atSmishingYn eq 'N'}">오프</c:if>[이용정지]
+													<span style="overflow:hidden;text-overflow:ellipsis;white-space:nowrap;display:block;margin-top:3px;" title="<c:out value="${result.cancelDate}"/>">
+														<fmt:parseDate value="${result.cancelDate}" var="cancelDateValue" pattern="yyyy-MM-dd HH:mm"/>
+														<fmt:formatDate value="${cancelDateValue}" pattern="MM-dd HH:mm"/>
+													</span>
+												</span>
+											</c:when>
+											<c:when test="${result.atDelayCompleteYn eq 'N'}">
+												<c:if test="${result.atSmishingYn eq 'Y'}">온</c:if>
+												<c:if test="${result.atSmishingYn eq 'N'}">오프</c:if>[미처리]
+											</c:when>
+											<c:otherwise>
+												<span style="color: #0000FF;">
+													<c:if test="${result.atSmishingYn eq 'Y'}">온</c:if>
+													<c:if test="${result.atSmishingYn eq 'N'}">오프</c:if>[승인]
+												</span>
+											</c:otherwise>
+										</c:choose>
+									</c:when>
+									<c:otherwise>
+										-
+									</c:otherwise>
+								</c:choose>
+							</td>
+							<td onclick="fn_detail_list('<c:out value="${result.msgGroupId}"/>', '<c:out value="${result.userId}"/>'); return false;" title="<c:out value="${result.rsltDate}"/>" <c:if test="${result.atSmishingYn eq 'Y'}">class="smishing"</c:if>>
 								<fmt:parseDate value="${result.reqDate}" var="reqDateValue" pattern="yyyy-MM-dd HH:mm"/>
 								<fmt:formatDate value="${reqDateValue}" pattern="MM-dd HH:mm"/>								
 							</td>
-							<td onclick="fn_detail_list('${result.msgGroupId}', '<c:out value="${result.userId}"/>'); return false;" style="cursor:pointer;">
+							<td onclick="fn_detail_list('${result.msgGroupId}', '<c:out value="${result.userId}"/>'); return false;" <c:if test="${result.atSmishingYn eq 'Y'}">class="smishing"</c:if>>
 								<c:choose>
 									<c:when test="${result.reserveYn eq 'Y'}">
 										예약

 									</c:otherwise>
 								</c:choose>
 							</td>							
-							<td class="sms_detail left" onclick="fn_detail_list('<c:out value="${result.msgGroupId}"/>', '<c:out value="${result.userId}"/>'); return false;" style="cursor:pointer;">
+							<td class="sms_detail left <c:if test="${result.atSmishingYn eq 'Y'}">smishing</c:if>" onclick="fn_detail_list('<c:out value="${result.msgGroupId}"/>', '<c:out value="${result.userId}"/>'); return false;" style="cursor:pointer;">
 								<p><c:out value="${result.smsTxt}"/></p>
 								<div class="sms_detail_hover">
 									<c:out value="${fn:replace(fn:replace(result.smsTxt, newLineChar, '<br/>'), newLineChar2, '<br/>')}" escapeXml="false"/>
 								</div>
 							</td>
-							<td onclick="fn_detail_list('<c:out value="${result.msgGroupId}"/>', '<c:out value="${result.userId}"/>'); return false;" style="cursor:pointer;">
+							<td onclick="fn_detail_list('<c:out value="${result.msgGroupId}"/>', '<c:out value="${result.userId}"/>'); return false;" style="cursor:pointer;" <c:if test="${result.atSmishingYn eq 'Y'}">class="smishing"</c:if>>
 								<c:out value="${result.msgTypeName}"/>
 							</td>
-							<%-- <td><c:out value="${result.conectMthdTxt}"/></td> --%>
-							<%-- <td <c:if test="${result.atSmishingYn eq 'Y'}">class="atSmishingYn"</c:if>>
-								<c:out value="${result.agentCodeTxt}"/>
-							</td> --%>
-							<%-- <td><c:out value="${result.rsltNet}"/></td> --%>
 						</tr>
 						</c:forEach>
 						<c:if test="${empty resultList}">

Add a comment

Open 0
Closed 0

List

...	...	@@ -159,7 +159,16 @@
159	159	}
160	160
161	161	if(kakaoVO.getAtSmishingYn().equals("Y")) {
162		- String sandDate = kakaoVO.getReqDate();
	162	+ String sandDate = "";
	163	+
	164	+ if(kakaoVO.getDivideChk().equals("Y")) {
	165	+ //분할 문자 예약 시간 입력해주기
	166	+ sandDate = dividDayList.get(i);
	167	+ }else {
	168	+ //예약 시간 입력해주기
	169	+ sandDate = kakaoVO.getReqDate();
	170	+ }
	171	+
163	172	SimpleDateFormat sdFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
164	173	Date date = sdFormat.parse(sandDate);
165	174

...	...	@@ -356,7 +356,7 @@
356	356
357	357	private String atDelayYn = "N"; // 알림 30분 지연 처리 유무
358	358	private String atDelayCompleteYn; // 알림톡 30분 지연 처리 완료 유무
359		- private String atSmishingYn; // 알림 지연처리
	359	+ private String atSmishingYn; // 알림톡 스메싱 여부
360	360
361	361	private int totalCallCnt; //수신자 전체 갯
362	362

...	...	@@ -2,6 +2,7 @@
2	2
3	3	import java.text.SimpleDateFormat;
4	4	import java.util.ArrayList;
	5	+import java.util.Calendar;
5	6	import java.util.Date;
6	7	import java.util.List;
7	8
...	...	@@ -17,6 +18,7 @@
17	18	import egovframework.rte.fdl.security.intercept.EgovReloadableFilterInvocationSecurityMetadataSource;
18	19	import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper;
19	20	import itn.com.cmm.LoginVO;
	21	+import itn.com.cmm.util.MJUtil;
20	22	import itn.com.utl.fcc.service.EgovDateUtil;
21	23	import itn.let.mjo.msg.service.MjPhoneMemberVO;
22	24	import itn.let.mjo.msg.service.MjonMapAddressVO;
...	...	@@ -911,6 +913,7 @@
911	913	int resultSts = 0;
912	914
913	915	try {
	916	+ boolean timeType = true;
914	917
915	918	System.out.println("++++++++++++++++++ updateKakaoAtDelaySendRealTimeData groupId ::: "+mjonResvMsgVO.getMsgGroupId());
916	919	//삭제 문자 건수 MSG_SEQ 번호 받아오기
...	...	@@ -919,31 +922,32 @@
919	922	int size = resultMsgSeqList.size();
920	923	List<String> userDataList = new ArrayList<String>();
921	924	for(int i=0; i < size; i++) {
922		-
923	925	userDataList.add(resultMsgSeqList.get(i).getUserData());
924	926	System.out.println(resultMsgSeqList.get(i).getUserData());
925		-
926	927	}
927		-
928	928	mjonResvMsgVO.setUserDataList(userDataList);
929	929
930		- //비즈뿌리오 딜레이문자 즉시발송 처리
931		- resultSts = mjonReservMsgDAO.updateRealTimeBizMsgSeqListByMsgSeq(mjonResvMsgVO);
	930	+ if(resultMsgSeqList.get(0).getReserveYn().equals("N")) {
	931	+ // 즉시 발송시
	932	+ //비즈뿌리오 딜레이문자 즉시발송 처리
	933	+ resultSts = mjonReservMsgDAO.updateRealTimeBizMsgSeqListByMsgSeq(mjonResvMsgVO);
	934	+
	935	+ }else {
	936	+ // 예약 발송시
	937	+ //비즈뿌리오 딜레이문자 예약발송 처리
	938	+ resultSts = mjonReservMsgDAO.updateReserveTimeBizMsgSeqListByMsgSeq(mjonResvMsgVO);
	939	+ }
932	940
933	941	System.out.println("++++++++++++++++++++++++++++++ resultSts ::: "+resultSts);
934	942
935		- //예약 취소 환불 처리
	943	+ //발송 시간 수정(mj_msg_data, mj_msg_group_data)
936	944	if(resultSts > 0) {
937		-
938	945	//그룹 데이터 정보 조회하기
939	946	MjonMsgVO mjonMsgVO = mjonMsgDAO.selectMsgGroupDataByGoupId(mjonResvMsgVO);
940		-
941	947	//mj_msg_data 테이블 지연 문자 즉시발송 요청 값 수정
942	948	mjonMsgDAO.updateKakaoAtDelaySendRealTimeMsgDataFlag(mjonMsgVO);
943		-
944	949	//mj_msg_group_data 테이블 즉시발송 요청 값 수정
945	950	mjonMsgDAO.updateKakaoAtDelaySendRealTimeMsgGroupDataFlag(mjonMsgVO);
946		-
947	951	}
948	952
949	953	} catch (Exception e) {

...	...	@@ -348,6 +348,8 @@
348	348	M2.yellowId ,
349	349	M2.userNm ,
350	350	M2.atSmishingYn ,
	351	+ M2.atDelayCompleteYn,
	352	+ M2.atDelayYn,
351	353	( SELECT COUNT(0)
352	354	FROM MJ_MSG_DATA C
353	355	WHERE C.DEL_FLAG = 'N'
...	...	@@ -451,46 +453,49 @@
451	453	MSG_NOTICETALK_TMP_KEY AS msgNoticetalkTmpKey ,
452	454	MKPI.YELLOW_ID AS yellowId ,
453	455	LTM.MBER_NM AS userNm ,
454		- LTM.AT_SMISHING_YN AS atSmishingYn,
	456	+ LTM.AT_SMISHING_YN AS atSmishingYn,
455	457	BIZ_UMID AS bizUmid,
456	458	BL.CALL_STATUS AS callStatus,
457		- M.BIZ_KAKAO_RESEND_YN AS bizKakaoResendYn
458		- FROM (
459		- SELECT MG.USER_ID ,
460		- MG.MSG_GROUP_ID ,
461		- MG.MSG_GROUP_CNT ,
462		- MG.SMS_TXT ,
463		- MG.SUBJECT ,
464		- MG.REGDATE ,
465		- MG.REQ_DATE ,
466		- MD.RSLT_DATE ,
467		- MG.CALL_FROM ,
468		- MG.TOT_PRICE ,
469		- MG.EACH_PRICE ,
470		- MG.DEL_FLAG ,
471		- MG.MSG_TYPE ,
472		- MG.FILE_CNT ,
473		- MG.AGENT_CODE ,
474		- MG.RESERVE_YN ,
475		- MG.RESERVE_C_YN ,
476		- MG.CANCELDATE ,
477		- MD.MSG_SEQ ,
478		- MD.CALL_TO ,
479		- MD.CUR_STATE ,
480		- MD.RSLT_CODE ,
481		- MD.RSLT_CODE2 ,
482		- CASE
	459	+ M.BIZ_KAKAO_RESEND_YN AS bizKakaoResendYn,
	460	+ M.AT_DELAY_COMPLETE_YN AS atDelayCompleteYn,
	461	+ M.AT_DELAY_YN AS atDelayYn
	462	+ FROM
	463	+ (SELECT
	464	+ MG.USER_ID
	465	+ , MG.MSG_GROUP_ID
	466	+ , MG.MSG_GROUP_CNT
	467	+ , MG.SMS_TXT
	468	+ , MG.SUBJECT
	469	+ , MG.REGDATE
	470	+ , MG.REQ_DATE
	471	+ , MD.RSLT_DATE
	472	+ , MG.CALL_FROM
	473	+ , MG.TOT_PRICE
	474	+ , MG.EACH_PRICE
	475	+ , MG.DEL_FLAG
	476	+ , MG.MSG_TYPE
	477	+ , MG.FILE_CNT
	478	+ , MG.AGENT_CODE
	479	+ , MG.RESERVE_YN
	480	+ , MG.RESERVE_C_YN
	481	+ , MG.CANCELDATE
	482	+ , MD.MSG_SEQ
	483	+ , MD.CALL_TO
	484	+ , MD.CUR_STATE
	485	+ , MD.RSLT_CODE
	486	+ , MD.RSLT_CODE2
	487	+ , CASE
483	488	WHEN MG.MSG_TYPE = '8'
484	489	THEN '알림톡'
485	490	WHEN MG.MSG_TYPE = '9'
486	491	THEN '친구톡'
487		- END msgTypeName ,
488		- CASE
	492	+ END msgTypeName
	493	+ , CASE
489	494	WHEN MG.MSG_TYPE = '8'
490	495	THEN '1'
491	496	ELSE '2'
492		- END orderByCode ,
493		- (
	497	+ END orderByCode
	498	+ , (
494	499	CASE
495	500	WHEN MD.RSLT_CODE = '7000'
496	501	THEN 'S'
...	...	@@ -498,18 +503,24 @@
498	503	THEN 'W'
499	504	ELSE 'F'
500	505	END
501		- ) AS result ,
502		- MSG_NOTICETALK_SENDER_KEY ,
503		- MSG_NOTICETALK_TMP_KEY,
504		- MD.BIZ_UMID,
505		- MD.BIZ_KAKAO_RESEND_YN
506		- FROM MJ_MSG_DATA MD ,
507		- MJ_MSG_GROUP_DATA MG
508		- WHERE MD.MSG_GROUP_ID = MG.MSG_GROUP_ID
	506	+ ) AS result
	507	+ , MSG_NOTICETALK_SENDER_KEY
	508	+ , MSG_NOTICETALK_TMP_KEY
	509	+ , MD.BIZ_UMID
	510	+ , MD.BIZ_KAKAO_RESEND_YN
	511	+ , MG.AT_DELAY_COMPLETE_YN
	512	+ , MG.AT_DELAY_YN
	513	+ FROM
	514	+ MJ_MSG_DATA MD
	515	+ , MJ_MSG_GROUP_DATA MG
	516	+ WHERE 1=1
	517	+ AND MD.MSG_GROUP_ID = MG.MSG_GROUP_ID
509	518	AND IFNULL(MG.DEL_FLAG, 'N') = 'N'
510	519	AND MD.DEL_FLAG = 'N'
511	520	<!-- JSPark 2023.03.24 알림톡 전송완료 목록은 (즉시 + 예약 발송완료) 노출 -->
512		- <![CDATA[ AND MG.REQ_DATE <= NOW() ]]>
	521	+ <![CDATA[
	522	+ AND MG.REQ_DATE <= DATE_ADD(NOW(), INTERVAL 60 MINUTE)
	523	+ ]]>
513	524	<isNotEmpty property="userId">
514	525	AND MG.USER_ID = #userId#
515	526	</isNotEmpty>
...	...	@@ -1058,6 +1069,9 @@
1058	1069	M2.msgNoticetalkTmpKey ,
1059	1070	M2.yellowId ,
1060	1071	M2.userNm ,
	1072	+ M2.atSmishingYn,
	1073	+ M2.atDelayCompleteYn,
	1074	+ M2.atDelayYn,
1061	1075	( SELECT COUNT(0)
1062	1076	FROM MJ_MSG_DATA C
1063	1077	WHERE C.DEL_FLAG = 'N'
...	...	@@ -1158,12 +1172,15 @@
1158	1172	orderByCode AS orderByCode ,
1159	1173	RESULT AS msgResult ,
1160	1174	MSG_NOTICETALK_SENDER_KEY AS msgNoticetalkSenderKey ,
1161		- MSG_NOTICETALK_TMP_KEY AS msgNoticetalkTmpKey ,
1162		- MKPI.YELLOW_ID AS yellowId ,
1163		- LTM.MBER_NM AS userNm ,
	1175	+ MSG_NOTICETALK_TMP_KEY AS msgNoticetalkTmpKey ,
	1176	+ MKPI.YELLOW_ID AS yellowId ,
	1177	+ LTM.MBER_NM AS userNm ,
	1178	+ LTM.AT_SMISHING_YN AS atSmishingYn,
1164	1179	BIZ_UMID AS bizUmid,
1165	1180	BL.CALL_STATUS AS callStatus,
1166		- M.BIZ_KAKAO_RESEND_YN AS bizKakaoResendYn
	1181	+ M.BIZ_KAKAO_RESEND_YN AS bizKakaoResendYn,
	1182	+ M.AT_DELAY_COMPLETE_YN AS atDelayCompleteYn,
	1183	+ M.AT_DELAY_YN AS atDelayYn
1167	1184	FROM (
1168	1185	SELECT MG.USER_ID ,
1169	1186	MG.MSG_GROUP_ID ,
...	...	@@ -1207,16 +1224,19 @@
1207	1224	THEN 'W'
1208	1225	ELSE 'F'
1209	1226	END
1210		- ) AS result ,
1211		- MSG_NOTICETALK_SENDER_KEY ,
1212		- MSG_NOTICETALK_TMP_KEY,
1213		- MD.BIZ_UMID,
1214		- MD.BIZ_KAKAO_RESEND_YN
	1227	+ ) AS result
	1228	+ , MSG_NOTICETALK_SENDER_KEY
	1229	+ , MSG_NOTICETALK_TMP_KEY
	1230	+ , MD.BIZ_UMID
	1231	+ , MD.BIZ_KAKAO_RESEND_YN
	1232	+ , MG.AT_DELAY_COMPLETE_YN
	1233	+ , MG.AT_DELAY_YN
1215	1234	FROM MJ_MSG_DATA MD ,
1216	1235	MJ_MSG_GROUP_DATA MG
1217	1236	WHERE MD.MSG_GROUP_ID = MG.MSG_GROUP_ID
1218	1237	AND IFNULL(MG.DEL_FLAG, 'N') = 'N'
1219	1238	AND MD.DEL_FLAG = 'N'
	1239	+
1220	1240	<isNotEmpty property="userId">
1221	1241	AND MG.USER_ID = #userId#
1222	1242	</isNotEmpty>
...	...	@@ -1386,7 +1406,7 @@
1386	1406	, B.SMS_TXT
1387	1407	, B.SUBJECT
1388	1408	, B.REGDATE
1389		- , B.REQ_DATE
	1409	+ , A.REQ_DATE
1390	1410	, A.RSLT_DATE
1391	1411	, B.CALL_FROM
1392	1412	, B.TOT_PRICE

...	...	@@ -5776,15 +5776,18 @@
5776	5776
5777	5777	<select id="mjonMsgDAO.selectMsgGroupDataByGoupId" parameterClass="mjonResvMsgVO" resultClass="mjonMsgVO">
5778	5778
5779		- SELECT MSG_GROUP_ID AS msgGroupId,
5780		- USER_ID AS userId,
5781		- SMS_TXT AS smsTxt,
5782		- EACH_PRICE AS eachPrice,
5783		- TOT_PRICE AS totPrice,
5784		- MSG_GROUP_CNT AS msgGroupCnt
5785		- FROM MJ_MSG_GROUP_DATA
5786		- WHERE USER_ID = #userId#
5787		- AND MSG_GROUP_ID = #msgGroupId#
	5779	+ SELECT
	5780	+ MSG_GROUP_ID AS msgGroupId
	5781	+ , USER_ID AS userId
	5782	+ , SMS_TXT AS smsTxt
	5783	+ , EACH_PRICE AS eachPrice
	5784	+ , TOT_PRICE AS totPrice
	5785	+ , MSG_GROUP_CNT AS msgGroupCnt
	5786	+ FROM
	5787	+ MJ_MSG_GROUP_DATA
	5788	+ WHERE 1=1
	5789	+ AND USER_ID = #userId#
	5790	+ AND MSG_GROUP_ID = #msgGroupId#
5788	5791	ORDER BY MSG_GROUP_ID DESC
5789	5792	LIMIT 1
5790	5793
...	...	@@ -5833,10 +5836,12 @@
5833	5836
5834	5837	<select id="mjonMsgDAO.selectMsgGroupDataReqDateList" parameterClass="mjonMsgResvVO" resultClass="mjonMsgResvVO">
5835	5838
5836		- SELECT DATE_FORMAT(REQ_DATE, '%Y-%m-%d %T' ) AS strReqDate
5837		- FROM MJ_MSG_GROUP_DATA
	5839	+ SELECT
	5840	+ DATE_FORMAT(REQ_DATE, '%Y-%m-%d %T' ) AS strReqDate
	5841	+ FROM
	5842	+ MJ_MSG_GROUP_DATA
5838	5843	WHERE 1=1
5839		- AND USER_ID = #userId#
	5844	+ AND USER_ID = #userId#
5840	5845	<iterate prepend="AND MSG_GROUP_ID IN" open="(" close=")" conjunction="," property="msgGroupIdList">
5841	5846	#msgGroupIdList[]#
5842	5847	</iterate>
...	...	@@ -6597,28 +6602,42 @@
6597	6602	</update>
6598	6603
6599	6604	<update id="mjonMsgDAO.updateKakaoAtDelaySendRealTimeMsgDataFlag" parameterClass="mjonMsgVO">
6600		-
6601	6605	UPDATE
6602	6606	MJ_MSG_DATA
6603	6607	SET
6604		- REQ_DATE = NOW()
	6608	+ REQ_DATE =
	6609	+ <![CDATA[
	6610	+ CASE
	6611	+ WHEN TIMESTAMPDIFF(MINUTE, NOW(), REQ_DATE) < 0
	6612	+ THEN REQ_DATE
	6613	+ WHEN TIMESTAMPDIFF(MINUTE, NOW(), REQ_DATE) >= 30
	6614	+ THEN DATE_ADD(REQ_DATE, INTERVAL -30 MINUTE)
	6615	+ ELSE DATE_ADD(REQ_DATE, INTERVAL -(TIMESTAMPDIFF(MINUTE, NOW(), REQ_DATE)) MINUTE)
	6616	+ END
	6617	+ ]]>
6605	6618	WHERE 1=1
6606	6619	AND USER_ID = #userId#
6607	6620	AND MSG_GROUP_ID = #msgGroupId#
6608		-
6609	6621	</update>
6610	6622
6611	6623	<update id="mjonMsgDAO.updateKakaoAtDelaySendRealTimeMsgGroupDataFlag" parameterClass="mjonMsgVO">
6612		-
6613	6624	UPDATE
6614	6625	MJ_MSG_GROUP_DATA
6615	6626	SET
6616		- REQ_DATE = NOW()
	6627	+ REQ_DATE =
	6628	+ <![CDATA[
	6629	+ CASE
	6630	+ WHEN TIMESTAMPDIFF(MINUTE, NOW(), REQ_DATE) < 0
	6631	+ THEN REQ_DATE
	6632	+ WHEN TIMESTAMPDIFF(MINUTE, NOW(), REQ_DATE) >= 30
	6633	+ THEN DATE_ADD(REQ_DATE, INTERVAL -30 MINUTE)
	6634	+ ELSE DATE_ADD(REQ_DATE, INTERVAL -(TIMESTAMPDIFF(MINUTE, NOW(), REQ_DATE)) MINUTE)
	6635	+ END
	6636	+ ]]>
6617	6637	, AT_DELAY_COMPLETE_YN = 'Y'
6618	6638	WHERE 1=1
6619	6639	AND USER_ID = #userId#
6620	6640	AND MSG_GROUP_ID = #msgGroupId#
6621		-
6622	6641	</update>
6623	6642
6624	6643	</sqlMap>

...	...	@@ -49,11 +49,16 @@
49	49	import itn.let.kakao.kakaoComm.kakaoApi.KakaoApiTemplate;
50	50	import itn.let.kakao.kakaoComm.kakaoApi.service.KakaoApiService;
51	51	import itn.let.kakao.user.kakaoAt.service.KakaoAlimTalkService;
	52	+import itn.let.mjo.mjocommon.MjonCommon;
	53	+import itn.let.mjo.msg.service.MjonMsgVO;
52	54	import itn.let.mjo.msgdata.service.MjonMsgDataService;
53	55	import itn.let.mjo.msgdata.service.MjonMsgDataVO;
54	56	import itn.let.mjo.msgdata.service.MjonMsgReturnVO;
	57	+import itn.let.sym.site.service.EgovSiteManagerService;
55	58	import itn.let.sym.site.service.JoinSettingVO;
	59	+import itn.let.uss.umt.service.EgovUserManageService;
56	60	import itn.let.uss.umt.service.MberManageVO;
	61	+import itn.let.uss.umt.service.UserManageVO;
57	62
58	63	/**
59	64	*
...	...	@@ -86,10 +91,18 @@
86	91
87	92	@Resource(name = "MjonMsgDataService")
88	93	private MjonMsgDataService mjonMsgDataService;
	94	+
	95	+ /** userManageService */
	96	+ @Resource(name = "userManageService")
	97	+ private EgovUserManageService userManageService;
89	98
90	99	/** EgovMessageSource */
91	100	@Resource(name="egovMessageSource")
92	101	EgovMessageSource egovMessageSource;
	102	+
	103	+ /** 사이트 설정 */
	104	+ @Resource(name = "egovSiteManagerService")
	105	+ EgovSiteManagerService egovSiteManagerService;
93	106
94	107	@Autowired
95	108	KakaoApiProfile kakaoApiProfile;
...	...	@@ -480,10 +493,9 @@
480	493	int resultSts = 0; //발송결과 건수
481	494	int resultBlockSts = 0; //수신거부 등록번호로 발송을 안한 건수
482	495
	496	+ LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
	497	+ String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId());
483	498	try {
484		-
485		- LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
486		- String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId());
487	499
488	500	if(userId == "") {
489	501	modelAndView.addObject("message", "로그인 후 이용이 가능합니다.");
...	...	@@ -492,7 +504,9 @@
492	504	}else {
493	505	/** 카카오톡 전송 기본 설정 -------------------------------------------*/
494	506	kakaoVO.setSendType("AT");
	507	+ kakaoVO.setMsgType("8");
495	508	kakaoVO.setUserId(userId);
	509	+
496	510	}
497	511
498	512	/** 전송금액 설정 --------------------------------------------------*/
...	...	@@ -710,6 +724,43 @@
710	724	modelAndView.addObject("result", "success");
711	725	modelAndView.addObject("resultSts", resultSts);
712	726
	727	+
	728	+/** 카카오톡 발송 내용 법인폰, 알림톡 결과 처리 --------------------------------------------------*/
	729	+ try {
	730	+ String adminSmsNoticeYn = "Y";
	731	+ String spamStatus = kakaoVO.getAtSmishingYn(); // 스미싱 의심으로 체크된 고객 정보
	732	+
	733	+ UserManageVO userManageVO = new UserManageVO();
	734	+ userManageVO.setMberId(userId);
	735	+
	736	+ if(!userId.equals("")) {
	737	+ userManageVO = userManageService.selectAdminSmsNoticeYn(userManageVO);
	738	+ adminSmsNoticeYn = userManageVO.getAdminSmsNoticeYn();
	739	+ }
	740	+
	741	+ //법인폰 알림 온 이거나 스미싱의심 문자인 경우 법인폰으로 발송
	742	+ if(adminSmsNoticeYn.equals("Y") \|\| spamStatus.equals("Y")) {
	743	+
	744	+ if(spamStatus.equals("Y")) {
	745	+ kakaoVO.setAtDelayYn("Y");
	746	+ }
	747	+
	748	+ // 법인폰 알람여부 체크
	749	+ JoinSettingVO joinSettingVO = new JoinSettingVO();
	750	+ joinSettingVO = egovSiteManagerService.selectAdminNotiDetail();
	751	+
	752	+ // SLACK 체크
	753	+ if (joinSettingVO != null && joinSettingVO.getSlackNoti().equals("Y")) {
	754	+ //Slack으로 메세지 전송 처리
	755	+ MjonCommon comm = new MjonCommon();
	756	+// comm.getAdminKakaoAtSandSlack(kakaoVO);
	757	+ }
	758	+ }
	759	+
	760	+ } catch (Exception e) {
	761	+ throw new Exception("++++++++++++++++++++++ getAdminPhoneSendMsgData Error !!! " + e);
	762	+ }
	763	+
713	764	return modelAndView;
714	765	}
715	766	}

...	...	@@ -29,6 +29,7 @@
29	29	private String fileCnt; //첨부 이미지 갯수 - 0: 장문, 1 이상은 그림문자
30	30	private String totMsgCnt; //전체 전송문자 갯수
31	31	private String curState; //전송 처리 결과값
	32	+ private String reserveYn; //예약 여부
32	33	private String reserveCYn; //예약 취소 여부
33	34	private String filePath1; //그림 이미지 1
34	35	private String filePath2; //그림 이미지 2
...	...	@@ -290,5 +291,10 @@
290	291	public void setStrReqDate(String strReqDate) {
291	292	this.strReqDate = strReqDate;
292	293	}
293		-
	294	+ public String getReserveYn() {
	295	+ return reserveYn;
	296	+ }
	297	+ public void setReserveYn(String reserveYn) {
	298	+ this.reserveYn = reserveYn;
	299	+ }
294	300	}

...	...	@@ -445,12 +445,17 @@
445	445	</select>
446	446
447	447	<select id="MjonReservMsgDAO.selectMsgSeqListByGroupId" parameterClass="mjonMsgResvVO" resultClass="mjonMsgResvVO">
448		-
449		- SELECT USERDATA AS userData
450		- FROM MJ_MSG_DATA
451		- WHERE USER_ID = #userId#
452		- AND MSG_GROUP_ID = #msgGroupId#
453		-
	448	+ SELECT
	449	+ A.USERDATA AS userData
	450	+ , DATE_FORMAT(A.REQ_DATE, '%Y-%m-%d %T' ) AS reqdate
	451	+ , B.RESERVE_YN AS reserveYn
	452	+ FROM
	453	+ MJ_MSG_DATA A
	454	+ , MJ_MSG_GROUP_DATA B
	455	+ WHERE A.MSG_GROUP_ID = B.MSG_GROUP_ID
	456	+ AND A.USER_ID = #userId#
	457	+ AND A.MSG_GROUP_ID = #msgGroupId#
	458	+ ORDER BY A.REQ_DATE ASC
454	459	</select>
455	460
456	461	<select id="MjonReservMsgDAO.selectMjonMsgGroupData" parameterClass="mjonMsgResvVO" resultClass="mjonMsgVO">
...	...	@@ -681,7 +686,6 @@
681	686
682	687	</update>
683	688
684		-
685	689	<update id="MjonReservMsgDAO.updateRealTimeIVTMsgSeqListByMsgSeq" parameterClass="mjonMsgResvVO">
686	690
687	691	UPDATE SMSQ_SEND
...	...	@@ -717,6 +721,27 @@
717	721
718	722	</update>
719	723
	724	+ <update id="MjonReservMsgDAO.updateReserveTimeBizMsgSeqListByMsgSeq" parameterClass="mjonMsgResvVO">
	725	+ UPDATE
	726	+ BIZ_MSG
	727	+ SET
	728	+ REQUEST_TIME =
	729	+ <![CDATA[
	730	+ CASE
	731	+ WHEN TIMESTAMPDIFF(MINUTE, NOW(), REQUEST_TIME) < 0
	732	+ THEN REQUEST_TIME
	733	+ WHEN TIMESTAMPDIFF(MINUTE, NOW(), REQUEST_TIME) >= 30
	734	+ THEN DATE_ADD(REQUEST_TIME, INTERVAL -30 MINUTE)
	735	+ ELSE DATE_ADD(REQUEST_TIME, INTERVAL -(TIMESTAMPDIFF(MINUTE, NOW(), REQUEST_TIME)) MINUTE)
	736	+ END
	737	+ ]]>
	738	+ WHERE 1=1
	739	+ <iterate prepend="AND USER_KEY IN" open="(" close=")" conjunction="," property="userDataList">
	740	+ #userDataList[]#
	741	+ </iterate>
	742	+
	743	+ </update>
	744	+
720	745	</sqlMap>
721	746
722	747

...	...	@@ -1290,15 +1290,17 @@
1290	1290	</select>
1291	1291
1292	1292	<select id="userManageDAO.selectAdminSmsNoticeYn" parameterClass="userVO" resultClass="userVO">
1293		- SELECT
1294		- ADMIN_SMS_NOTICE_YN AS adminSmsNoticeYn,
1295		- PRE_PAYMENT_YN AS prePaymentYn,
1296		- SMISHING_YN AS smishingYn,
1297		- AUTO_CASH AS autoCash,
1298		- IFNULL(BLINE_CODE, 'N') AS blineCode,
1299		- IFNULL(RECOMMEND_ID, '') AS recommendId
1300		- FROM LETTNGNRLMBER
1301		- WHERE MBER_ID = #mberId#
	1293	+ SELECT
	1294	+ ADMIN_SMS_NOTICE_YN AS adminSmsNoticeYn
	1295	+ ,PRE_PAYMENT_YN AS prePaymentYn
	1296	+ ,SMISHING_YN AS smishingYn
	1297	+ ,AUTO_CASH AS autoCash
	1298	+ ,IFNULL(BLINE_CODE, 'N') AS blineCode
	1299	+ ,IFNULL(RECOMMEND_ID, '') AS recommendId
	1300	+ FROM
	1301	+ LETTNGNRLMBER
	1302	+ WHERE
	1303	+ MBER_ID = #mberId#
1302	1304	</select>
1303	1305
1304	1306	<update id="userManageDAO.updateUserAdminSmsNoticeYn" parameterClass="userVO">

...	...	@@ -150,6 +150,7 @@
150	150	<input type="hidden" name="detailType" value="<c:out value="${searchVO.detailType}" />" />
151	151	<input type="hidden" name="ntceBgnde" id="ntceBgnde" value="">
152	152	<input type="hidden" name="ntceEndde" id="ntceEndde" value="">
	153	+ <input type="hidden" name="userId" id="userId" value="<c:out value="${searchVO.userId}" />" />
153	154
154	155	<div class="contWrap">
155	156	<div class="pageTitle">

...	...	@@ -351,10 +351,10 @@
351	351	if(checkedIds.length > 0) {
352	352	var msg = "";
353	353	if(flag == 'on') {
354		- document.listForm.smishingYn.value='Y';
	354	+ document.listForm.atSmishingYn.value='Y';
355	355	msg = "선택하신 사용자의 스미싱의심을 On 하시겠습니까?";
356	356	} else {
357		- document.listForm.smishingYn.value='N';
	357	+ document.listForm.atSmishingYn.value='N';
358	358	msg = "선택하신 사용자의 스미싱의심을 Off 하시겠습니까?";
359	359	}
360	360	if(confirm(msg)){
...	...	@@ -398,7 +398,7 @@
398	398	<input type="hidden" name="ntceEndde" id="ntceEndde" value="">
399	399	<input type="hidden" name="adminSmsNoticeYn" value=""/>
400	400	<input name="checkedIdForDel" type="hidden" />
401		- <input type="hidden" name="smishingYn" value=""/>
	401	+ <input type="hidden" name="atSmishingYn" value=""/>
402	402
403	403	<div class="contWrap">
404	404	<div class="pageTitle">
...	...	@@ -484,9 +484,8 @@
484	484	<col style="width: 5%">
485	485	<col style="width: 13%">
486	486	<col style="width: 13%">
487		- <%-- <col style="width: 10%"> --%>
488	487	<col style="width: 10%">
489		- <%-- <col style="width: 10%"> --%>
	488	+ <col style="width: 10%">
490	489	<col style="width: 10%">
491	490	<col style="width: 5%">
492	491	<col style="width: auto">
...	...	@@ -498,15 +497,12 @@
498	497	<th>번호<input type="button" class="sort sortBtn" id="sort_msgGroupId"></th>
499	498	<th>아이디<input type="button" class="sort sortBtn" id="sort_userId"></th>
500	499	<th>채널ID<input type="button" class="sort sortBtn" id="sort_yellowId"></th>
501		- <!-- <th>qkf<input type="button" class="sort sortBtn" id="sort_callFrom"></th> -->
502	500	<th>발송건수<input type="button" class="sort sortBtn" id="sort_msgGroupCnt"></th>
503		- <!-- <th>스미싱의심</th> -->
	501	+ <th>스미싱의심</th>
504	502	<th>요청시간<input type="button" class="sort sortBtn" id="sort_reqDate"></th>
505	503	<th>예약<input type="button" class="sort sortBtn" id="sort_reserveYn"></th>
506	504	<th>내용<input type="button" class="sort sortBtn" id="sort_smsTxt"></th>
507	505	<th>타입<input type="button" class="sort sortBtn" id="sort_msgType"></th>
508		- <!-- <th>전송사<input type="button" class="sort sortBtn" id="sort_agentCodeTxt"></th> -->
509		- <!-- <th>통신사<input type="button" class="sort sortBtn" id="sort_rsltNet"></th> -->
510	506	</tr>
511	507	</thead>
512	508	<tbody>
...	...	@@ -516,7 +512,7 @@
516	512	<input name="checkField" id="<c:out value="${result.userId}"/>" title="Check <c:out value="${status.count}"/>" type="checkbox"/><label for="<c:out value="${result.userId}"/>"></label>
517	513	<input name="checkId" type="hidden" class="${result.userId}" value="<c:out value='${result.userId}'/>:<c:out value='${result.userId}'/>"/>
518	514	</td>
519		- <td>
	515	+ <td <c:if test="${result.atSmishingYn eq 'Y'}">class="smishing"</c:if>>
520	516	<c:if test="${searchVO.searchSortOrd eq 'desc' }">
521	517	<c:out value="${ ( paginationInfo.totalRecordCount - ((paginationInfo.currentPageNo -1)*paginationInfo.recordCountPerPage) ) - status.index }"/>
522	518	</c:if>
...	...	@@ -524,23 +520,17 @@
524	520	<c:out value="${(paginationInfo.currentPageNo - 1) * paginationInfo.recordCountPerPage + status.count}"/>
525	521	</c:if>
526	522	</td>
527		- <td>
	523	+ <td <c:if test="${result.atSmishingYn eq 'Y'}">class="smishing"</c:if>>
528	524	<div class="id_box <c:if test='${result.vipYn eq "Y" }'>vip</c:if>">
529	525	<a href="#" onclick="javascript:fnSelectMber('<c:out value="${result.userId}"/>'); return false;">
530	526	<c:out value="${result.userId}"/>(<c:out value="${result.userNm}"/>)
531	527	</a>
532	528	</div>
533	529	</td>
534		-
535		- <td onclick="fn_detail_list('<c:out value="${result.msgGroupId}"/>', '<c:out value="${result.userId}"/>'); return false;" style="cursor:pointer;">
536		- <c:out value="${result.yellowId}"/>
537		- </td>
538		-
539		- <%-- <td onclick="fn_detail_list('${result.msgGroupId}'); return false;" <c:if test="${result.smishingYn eq 'Y'}">class="smishing" style="cursor:pointer;"</c:if><c:if test="${result.smishingYn eq 'N'}">style="cursor:pointer;"</c:if>>
540		- <c:out value="${result.callFrom}"/>
541		- </td> --%>
542		-
543		- <td onclick="fn_detail_list('<c:out value="${result.msgGroupId}"/>', '<c:out value="${result.userId}"/>'); return false;" style="cursor:pointer;line-height:30px;text-align:right;">
	530	+ <td onclick="fn_detail_list('<c:out value="${result.msgGroupId}"/>', '<c:out value="${result.userId}"/>'); return false;" style="cursor:pointer;" <c:if test="${result.atSmishingYn eq 'Y'}">class="smishing"</c:if>>
	531	+ <c:out value="${result.yellowId}"/>
	532	+ </td>
	533	+ <td onclick="fn_detail_list('<c:out value="${result.msgGroupId}"/>', '<c:out value="${result.userId}"/>'); return false;" style="cursor:pointer;line-height:30px;text-align:right;" <c:if test="${result.atSmishingYn eq 'Y'}">class="smishing"</c:if>>
544	534	<c:choose>
545	535	<c:when test="${result.successCount > 0}">
546	536	<c:out value="${result.msgGroupCnt}"/>(<fmt:formatNumber value="${(result.successCount / result.msgGroupCnt) * 100}" pattern="#,###" />%)
...	...	@@ -549,20 +539,50 @@
549	539	<span style="color: #0000FF;">
550	540	<c:out value="${result.msgGroupCnt}"/>(<fmt:formatNumber value="${(result.successCount / result.msgGroupCnt) * 100}" pattern="#,###" />%)
551	541	<c:if test="${result.msgGroupCnt eq result.callRejectionCount && result.callbackYn eq 'N' && result.userCallbackYn eq 'N' }">
552		- <%-- <input type="button" style="margin-left:3px;margin-right:0;vertical-align:top;" class="btnType1" onclick="fn_sendMsgData('<c:out value="${result.msgGroupId}"/>','<c:out value="${result.callFrom}"/>','<c:out value="${result.userId}"/>');" value="문자" /> --%>
553		- </c:if>
	542	+ <%-- <input type="button" style="margin-left:3px;margin-right:0;vertical-align:top;" class="btnType1" onclick="fn_sendMsgData('<c:out value="${result.msgGroupId}"/>','<c:out value="${result.callFrom}"/>','<c:out value="${result.userId}"/>');" value="문자" /> --%>
	543	+ </c:if>
554	544	<c:if test="${result.callbackYn eq 'Y' }">
555		- <span style="color: #0000FF;" title="번호도용 문자차단 안내문자 발송완료">안내완료</span>
556		- </c:if>
	545	+ <span style="color: #0000FF;" title="번호도용 문자차단 안내문자 발송완료">안내완료</span>
	546	+ </c:if>
557	547	</span>
558	548	</c:otherwise>
559		- </c:choose>
	549	+ </c:choose>
560	550	</td>
561		- <td onclick="fn_detail_list('<c:out value="${result.msgGroupId}"/>', '<c:out value="${result.userId}"/>'); return false;" style="cursor:pointer;" title="<c:out value="${result.rsltDate}"/>">
	551	+ <td <c:if test="${result.atSmishingYn eq 'Y'}">class="smishing"</c:if>>
	552	+ <c:choose>
	553	+ <c:when test="${result.atDelayYn eq 'Y'}">
	554	+ <c:choose>
	555	+ <c:when test="${result.atDelayCompleteYn eq 'Y' && not empty result.cancelDate}">
	556	+ <span style="color: #0000FF;">
	557	+ <c:if test="${result.smishingYn eq 'Y'}">온</c:if><c:if test="${result.smishingYn eq 'N'}">오프</c:if>[이용정지]
	558	+ <span style="overflow:hidden;text-overflow:ellipsis;white-space:nowrap;display:block;margin-top:3px;" title="<c:out value="${result.cancelDate}"/>">
	559	+ <fmt:parseDate value="${result.cancelDate}" var="cancelDateValue" pattern="yyyy-MM-dd HH:mm"/>
	560	+ <fmt:formatDate value="${cancelDateValue}" pattern="MM-dd HH:mm"/>
	561	+ </span>
	562	+ </span>
	563	+ </c:when>
	564	+ <c:when test="${result.atDelayCompleteYn eq 'N'}">
	565	+ <c:if test="${result.atSmishingYn eq 'Y'}">온</c:if>
	566	+ <c:if test="${result.atSmishingYn eq 'N'}">오프</c:if>[미처리]
	567	+ </c:when>
	568	+ <c:otherwise>
	569	+ <span style="color: #0000FF;">
	570	+ <c:if test="${result.atSmishingYn eq 'Y'}">온</c:if>
	571	+ <c:if test="${result.atSmishingYn eq 'N'}">오프</c:if>[승인]
	572	+ </span>
	573	+ </c:otherwise>
	574	+ </c:choose>
	575	+ </c:when>
	576	+ <c:otherwise>
	577	+ -
	578	+ </c:otherwise>
	579	+ </c:choose>
	580	+ </td>
	581	+ <td onclick="fn_detail_list('<c:out value="${result.msgGroupId}"/>', '<c:out value="${result.userId}"/>'); return false;" style="cursor:pointer;" title="<c:out value="${result.rsltDate}"/>" <c:if test="${result.atSmishingYn eq 'Y'}">class="smishing"</c:if>>
562	582	<fmt:parseDate value="${result.reqDate}" var="reqDateValue" pattern="yyyy-MM-dd HH:mm"/>
563		- <fmt:formatDate value="${reqDateValue}" pattern="MM-dd HH:mm"/>
	583	+ <fmt:formatDate value="${reqDateValue}" pattern="MM-dd HH:mm"/>
564	584	</td>
565		- <td onclick="fn_detail_list('${result.msgGroupId}'); return false;" style="cursor:pointer;">
	585	+ <td onclick="fn_detail_list('${result.msgGroupId}'); return false;" style="cursor:pointer;" <c:if test="${result.atSmishingYn eq 'Y'}">class="smishing"</c:if>>
566	586	<c:choose>
567	587	<c:when test="${result.reserveYn eq 'Y'}">
568	588	예약
...	...	@@ -572,25 +592,20 @@
572	592	</c:otherwise>
573	593	</c:choose>
574	594	</td>
575		- <td class="sms_detail left" onclick="fn_detail_list('<c:out value="${result.msgGroupId}"/>', '<c:out value="${result.userId}"/>'); return false;" style="cursor:pointer;">
	595	+ <td class="sms_detail left <c:if test="${result.atSmishingYn eq 'Y'}">smishing</c:if>" onclick="fn_detail_list('<c:out value="${result.msgGroupId}"/>', '<c:out value="${result.userId}"/>'); return false;" style="cursor:pointer;">
576	596	<p><c:out value="${result.smsTxt}"/></p>
577	597	<div class="sms_detail_hover">
578	598	<c:out value="${fn:replace(fn:replace(result.smsTxt, newLineChar, '<br/>'), newLineChar2, '<br/>')}" escapeXml="false"/>
579	599	</div>
580	600	</td>
581		- <td onclick="fn_detail_list('<c:out value="${result.msgGroupId}"/>', '<c:out value="${result.userId}"/>'); return false;" style="cursor:pointer;">
	601	+ <td onclick="fn_detail_list('<c:out value="${result.msgGroupId}"/>', '<c:out value="${result.userId}"/>'); return false;" style="cursor:pointer;" <c:if test="${result.atSmishingYn eq 'Y'}">class="smishing"</c:if>>
582	602	<c:out value="${result.msgTypeName}"/>
583	603	</td>
584		- <%-- <td><c:out value="${result.conectMthdTxt}"/></td> --%>
585		- <%-- <td <c:if test="${result.smishingYn eq 'Y'}">class="smishing"</c:if>>
586		- <c:out value="${result.agentCodeTxt}"/>
587		- </td> --%>
588		- <%-- <td><c:out value="${result.rsltNet}"/></td> --%>
589	604	</tr>
590	605	</c:forEach>
591	606	<c:if test="${empty resultList}">
592		- <tr><td colspan="8"><spring:message code="common.nodata.msg" /></td></tr>
593		- </c:if>
	607	+ <tr><td colspan="10"><spring:message code="common.nodata.msg" /></td></tr>
	608	+ </c:if>
594	609	</tbody>
595	610	</table>
596	611	</div>

...	...	@@ -456,7 +456,7 @@
456	456	<col style="width: 13%">
457	457	<%-- <col style="width: 10%"> --%>
458	458	<col style="width: 10%">
459		- <%-- <col style="width: 10%"> --%>
	459	+ <col style="width: 10%">
460	460	<col style="width: 10%">
461	461	<col style="width: 5%">
462	462	<col style="width: auto">
...	...	@@ -468,15 +468,12 @@
468	468	<th>번호<input type="button" class="sort sortBtn" id="sort_msgGroupId"></th>
469	469	<th>아이디<input type="button" class="sort sortBtn" id="sort_userId"></th>
470	470	<th>채널ID<input type="button" class="sort sortBtn" id="sort_yellowId"></th>
471		- <!-- <th>qkf<input type="button" class="sort sortBtn" id="sort_callFrom"></th> -->
472	471	<th>발송건수<input type="button" class="sort sortBtn" id="sort_msgGroupCnt"></th>
473		- <!-- <th>스미싱의심</th> -->
	472	+ <th>스미싱의심</th>
474	473	<th>요청시간<input type="button" class="sort sortBtn" id="sort_reqDate"></th>
475	474	<th>예약<input type="button" class="sort sortBtn" id="sort_reserveYn"></th>
476	475	<th>내용<input type="button" class="sort sortBtn" id="sort_smsTxt"></th>
477	476	<th>타입<input type="button" class="sort sortBtn" id="sort_msgType"></th>
478		- <!-- <th>전송사<input type="button" class="sort sortBtn" id="sort_agentCodeTxt"></th> -->
479		- <!-- <th>통신사<input type="button" class="sort sortBtn" id="sort_rsltNet"></th> -->
480	477	</tr>
481	478	</thead>
482	479	<tbody>
...	...	@@ -486,7 +483,7 @@
486	483	<input name="checkField" id="<c:out value="${result.userId}"/>" title="Check <c:out value="${status.count}"/>" type="checkbox"/><label for="<c:out value="${result.userId}"/>"></label>
487	484	<input name="checkId" type="hidden" class="${result.userId}" value="<c:out value='${result.userId}'/>:<c:out value='${result.userId}'/>"/>
488	485	</td>
489		- <td>
	486	+ <td <c:if test="${result.atSmishingYn eq 'Y'}">class="smishing"</c:if>>
490	487	<c:if test="${searchVO.searchSortOrd eq 'desc' }">
491	488	<c:out value="${ ( paginationInfo.totalRecordCount - ((paginationInfo.currentPageNo -1)*paginationInfo.recordCountPerPage) ) - status.index }"/>
492	489	</c:if>
...	...	@@ -494,23 +491,17 @@
494	491	<c:out value="${(paginationInfo.currentPageNo - 1) * paginationInfo.recordCountPerPage + status.count}"/>
495	492	</c:if>
496	493	</td>
497		- <td>
	494	+ <td <c:if test="${result.atSmishingYn eq 'Y'}">class="smishing"</c:if>>
498	495	<div class="id_box <c:if test='${result.vipYn eq "Y" }'>vip</c:if>">
499	496	<a href="#" onclick="javascript:fnSelectMber('<c:out value="${result.userId}"/>'); return false;">
500	497	<c:out value="${result.userId}"/>(<c:out value="${result.userNm}"/>)
501	498	</a>
502	499	</div>
503	500	</td>
504		-
505		- <td onclick="fn_detail_list('<c:out value="${result.msgGroupId}"/>', '<c:out value="${result.userId}"/>'); return false;" style="cursor:pointer;">
	501	+ <td onclick="fn_detail_list('<c:out value="${result.msgGroupId}"/>', '<c:out value="${result.userId}"/>'); return false;" <c:if test="${result.atSmishingYn eq 'Y'}">class="smishing"</c:if>>
506	502	<c:out value="${result.yellowId}"/>
507		- </td>
508		-
509		- <%-- <td onclick="fn_detail_list('${result.msgGroupId}'); return false;" <c:if test="${result.atSmishingYn eq 'Y'}">class="atSmishingYn" style="cursor:pointer;"</c:if><c:if test="${result.atSmishingYn eq 'N'}">style="cursor:pointer;"</c:if>>
510		- <c:out value="${result.callFrom}"/>
511		- </td> --%>
512		-
513		- <td onclick="fn_detail_list('<c:out value="${result.msgGroupId}"/>', '<c:out value="${result.userId}"/>'); return false;" style="cursor:pointer;line-height:30px;text-align:right;">
	503	+ </td>
	504	+ <td onclick="fn_detail_list('<c:out value="${result.msgGroupId}"/>', '<c:out value="${result.userId}"/>'); return false;" <c:if test="${result.atSmishingYn eq 'Y'}">class="smishing"</c:if>>
514	505	<c:choose>
515	506	<c:when test="${result.successCount > 0}">
516	507	<c:out value="${result.msgGroupCnt}"/>(<fmt:formatNumber value="${(result.successCount / result.msgGroupCnt) * 100}" pattern="#,###" />%)
...	...	@@ -519,20 +510,51 @@
519	510	<span style="color: #0000FF;">
520	511	<c:out value="${result.msgGroupCnt}"/>(<fmt:formatNumber value="${(result.successCount / result.msgGroupCnt) * 100}" pattern="#,###" />%)
521	512	<c:if test="${result.msgGroupCnt eq result.callRejectionCount && result.callbackYn eq 'N' && result.userCallbackYn eq 'N' }">
522		- <%-- <input type="button" style="margin-left:3px;margin-right:0;vertical-align:top;" class="btnType1" onclick="fn_sendMsgData('<c:out value="${result.msgGroupId}"/>','<c:out value="${result.callFrom}"/>','<c:out value="${result.userId}"/>');" value="문자" /> --%>
523		- </c:if>
	513	+
	514	+ </c:if>
524	515	<c:if test="${result.callbackYn eq 'Y' }">
525		- <span style="color: #0000FF;" title="번호도용 문자차단 안내문자 발송완료">안내완료</span>
526		- </c:if>
	516	+ <span style="color: #0000FF;" title="번호도용 문자차단 안내문자 발송완료">안내완료</span>
	517	+ </c:if>
527	518	</span>
528	519	</c:otherwise>
529	520	</c:choose>
530	521	</td>
531		- <td onclick="fn_detail_list('<c:out value="${result.msgGroupId}"/>', '<c:out value="${result.userId}"/>'); return false;" style="cursor:pointer;" title="<c:out value="${result.rsltDate}"/>">
	522	+ <td <c:if test="${result.atSmishingYn eq 'Y'}">class="smishing"</c:if>>
	523	+ <c:choose>
	524	+ <c:when test="${result.atDelayYn eq 'Y'}">
	525	+ <c:choose>
	526	+ <c:when test="${result.atDelayCompleteYn eq 'Y' && not empty result.cancelDate}">
	527	+ <span style="color: #0000FF;">
	528	+ <c:if test="${result.atSmishingYn eq 'Y'}">온</c:if>
	529	+ <c:if test="${result.atSmishingYn eq 'N'}">오프</c:if>[이용정지]
	530	+ <span style="overflow:hidden;text-overflow:ellipsis;white-space:nowrap;display:block;margin-top:3px;" title="<c:out value="${result.cancelDate}"/>">
	531	+ <fmt:parseDate value="${result.cancelDate}" var="cancelDateValue" pattern="yyyy-MM-dd HH:mm"/>
	532	+ <fmt:formatDate value="${cancelDateValue}" pattern="MM-dd HH:mm"/>
	533	+ </span>
	534	+ </span>
	535	+ </c:when>
	536	+ <c:when test="${result.atDelayCompleteYn eq 'N'}">
	537	+ <c:if test="${result.atSmishingYn eq 'Y'}">온</c:if>
	538	+ <c:if test="${result.atSmishingYn eq 'N'}">오프</c:if>[미처리]
	539	+ </c:when>
	540	+ <c:otherwise>
	541	+ <span style="color: #0000FF;">
	542	+ <c:if test="${result.atSmishingYn eq 'Y'}">온</c:if>
	543	+ <c:if test="${result.atSmishingYn eq 'N'}">오프</c:if>[승인]
	544	+ </span>
	545	+ </c:otherwise>
	546	+ </c:choose>
	547	+ </c:when>
	548	+ <c:otherwise>
	549	+ -
	550	+ </c:otherwise>
	551	+ </c:choose>
	552	+ </td>
	553	+ <td onclick="fn_detail_list('<c:out value="${result.msgGroupId}"/>', '<c:out value="${result.userId}"/>'); return false;" title="<c:out value="${result.rsltDate}"/>" <c:if test="${result.atSmishingYn eq 'Y'}">class="smishing"</c:if>>
532	554	<fmt:parseDate value="${result.reqDate}" var="reqDateValue" pattern="yyyy-MM-dd HH:mm"/>
533	555	<fmt:formatDate value="${reqDateValue}" pattern="MM-dd HH:mm"/>
534	556	</td>
535		- <td onclick="fn_detail_list('${result.msgGroupId}', '<c:out value="${result.userId}"/>'); return false;" style="cursor:pointer;">
	557	+ <td onclick="fn_detail_list('${result.msgGroupId}', '<c:out value="${result.userId}"/>'); return false;" <c:if test="${result.atSmishingYn eq 'Y'}">class="smishing"</c:if>>
536	558	<c:choose>
537	559	<c:when test="${result.reserveYn eq 'Y'}">
538	560	예약
...	...	@@ -542,20 +564,15 @@
542	564	</c:otherwise>
543	565	</c:choose>
544	566	</td>
545		- <td class="sms_detail left" onclick="fn_detail_list('<c:out value="${result.msgGroupId}"/>', '<c:out value="${result.userId}"/>'); return false;" style="cursor:pointer;">
	567	+ <td class="sms_detail left <c:if test="${result.atSmishingYn eq 'Y'}">smishing</c:if>" onclick="fn_detail_list('<c:out value="${result.msgGroupId}"/>', '<c:out value="${result.userId}"/>'); return false;" style="cursor:pointer;">
546	568	<p><c:out value="${result.smsTxt}"/></p>
547	569	<div class="sms_detail_hover">
548	570	<c:out value="${fn:replace(fn:replace(result.smsTxt, newLineChar, '<br/>'), newLineChar2, '<br/>')}" escapeXml="false"/>
549	571	</div>
550	572	</td>
551		- <td onclick="fn_detail_list('<c:out value="${result.msgGroupId}"/>', '<c:out value="${result.userId}"/>'); return false;" style="cursor:pointer;">
	573	+ <td onclick="fn_detail_list('<c:out value="${result.msgGroupId}"/>', '<c:out value="${result.userId}"/>'); return false;" style="cursor:pointer;" <c:if test="${result.atSmishingYn eq 'Y'}">class="smishing"</c:if>>
552	574	<c:out value="${result.msgTypeName}"/>
553	575	</td>
554		- <%-- <td><c:out value="${result.conectMthdTxt}"/></td> --%>
555		- <%-- <td <c:if test="${result.atSmishingYn eq 'Y'}">class="atSmishingYn"</c:if>>
556		- <c:out value="${result.agentCodeTxt}"/>
557		- </td> --%>
558		- <%-- <td><c:out value="${result.rsltNet}"/></td> --%>
559	576	</tr>
560	577	</c:forEach>
561	578	<c:if test="${empty resultList}">

Delete comment