Commit @81c999966cde4ac4f52313e4ac0cdf8ee6bd11cf

itn 2023-06-19

알림톡 예약관리 쿼리 개선

@81c999966cde4ac4f52313e4ac0cdf8ee6bd11cf

1dac2a4

81c9999

src/main/java/itn/let/kakao/admin/kakaoAt/web/MjonKakaoATController.java

--- src/main/java/itn/let/kakao/admin/kakaoAt/web/MjonKakaoATController.java

+++ src/main/java/itn/let/kakao/admin/kakaoAt/web/MjonKakaoATController.java


 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;

 			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);
 	        

1dac2a4

81c9999

src/main/java/itn/let/uss/umt/web/EgovUserManageController.java

--- src/main/java/itn/let/uss/umt/web/EgovUserManageController.java

+++ src/main/java/itn/let/uss/umt/web/EgovUserManageController.java


 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;

 			 * 최근 알리톡/친구톡 전송 내역
 			 * */			
 			//최근 발송 문자 내용 불러오기 - 최근 3개 내역만
-			List<MjonKakaoATSentVO> mjonKakaoATSentList = mjonKakaoATService.selectMberKakaoATSentLatestList(userId);
-			model.addAttribute("mjonKakaoATSentList", mjonKakaoATSentList);			
+			//List<MjonKakaoATSentVO> mjonKakaoATSentList = mjonKakaoATService.selectMberKakaoATSentLatestList(userId);
+			//model.addAttribute("mjonKakaoATSentList", mjonKakaoATSentList);			
 		}
 		
 		{

1dac2a4

81c9999

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


 			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

 			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

 	<select id="mjonKakaoATDAO.selectReserveMjonKakaoATGroupList" parameterClass="kakaoVO" resultClass="kakaoVO">
 	/*	mjonKakaoATDAO.selectMjonKakaoATGroupList - 알림톡 예약조회	*/
 		SELECT
-			COUNT(M.USER_ID) OVER()					AS totCnt ,
-			M.USER_ID                             AS userId ,
-			MSG_GROUP_ID                          AS msgGroupId ,
-			MSG_GROUP_CNT                         AS msgGroupCnt ,
-			SMS_TXT                               AS smsTxt ,
-			M.SUBJECT                             AS subject ,
-			DATE_FORMAT(REGDATE, '%Y-%m-%d %T')   AS regDate ,
-			DATE_FORMAT(REQ_DATE, '%Y-%m-%d %T')  AS reqDate ,
-			DATE_FORMAT(RSLT_DATE, '%Y-%m-%d %T') AS rsltDate ,
-			CALL_FROM                             AS callFrom ,
-			CALL_TO                               AS callTo ,
-			TOT_PRICE                             AS totPrice ,
-			EACH_PRICE                            AS eachPrice ,
-			CUR_STATE                             AS curState ,
-			RSLT_CODE                             AS rsltCode ,
-			RSLT_CODE2                            AS rsltCode2 ,
-			IF((RSLT_CODE != '7000'),'1','0')     AS orderByrsltCode ,
-			DEL_FLAG                              AS delFlag ,
-			M.MSG_TYPE                            AS msgType ,
-			FILE_CNT                              AS fileCnt ,
-			AGENT_CODE                            AS agentCode ,
-			RESERVE_YN                            AS reserveYn ,
-			RESERVE_C_YN                          AS reserveCYn ,
-			CANCELDATE                            AS cancelDate ,
-			msgTypeName                           AS msgTypeName ,
-			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 ,
-			successCount,
-			atSuccessCount,
-			ftSuccessCount,
-			atFailCount,
-			ftFailCount,
-			BIZ_UMID                              AS bizUmid,
-			BL.CALL_STATUS                        AS callStatus,
-			M.BIZ_KAKAO_RESEND_YN                 AS bizKakaoResendYn,
+			M2.totCnt ,
+			M2.userId ,
+			M2.msgGroupId ,
+			M2.msgGroupCnt ,
+			M2.smsTxt ,
+			M2.subject ,
+			M2.regDate ,
+			M2.reqDate ,
+			M2.rsltDate ,
+			M2.callFrom ,
+			M2.callTo ,
+			M2.totPrice ,
+			M2.eachPrice ,
+			M2.curState ,
+			M2.rsltCode ,
+			M2.rsltCode2 ,
+			M2.orderByrsltCode ,
+			M2.delFlag ,
+			M2.msgType ,
+			M2.fileCnt ,
+			M2.agentCode ,
+			M2.reserveYn ,
+			M2.reserveCYn ,
+			M2.cancelDate ,
+			M2.msgTypeName ,
+			M2.orderByCode ,
+			M2.msgResult ,
+			M2.msgNoticetalkSenderKey ,
+			M2.msgNoticetalkTmpKey ,
+			M2.yellowId ,
+			M2.userNm ,
+			( SELECT COUNT(0) 
+				FROM    MJ_MSG_DATA C
+				WHERE   C.DEL_FLAG     = 'N'
+				AND     C.RESERVE_C_YN = 'N'
+				AND     C.MSG_GROUP_ID = M2.msgGroupId
+				AND     C.RSLT_CODE = '7000'
+			)	AS successCount ,
+			( SELECT COUNT(0) 
+				FROM    MJ_MSG_DATA C
+				WHERE   C.DEL_FLAG     = 'N'
+				AND     C.RESERVE_C_YN = 'N'
+				AND     C.MSG_GROUP_ID = M2.msgGroupId
+				AND     C.RSLT_CODE = '7000'
+				AND     C.MSG_TYPE = '8'
+			)	AS atSuccessCount ,
+			( SELECT COUNT(0) 
+				FROM    MJ_MSG_DATA C
+				WHERE   C.DEL_FLAG     = 'N'
+				AND     C.RESERVE_C_YN = 'N'
+				AND     C.MSG_GROUP_ID = M2.msgGroupId
+				AND     C.RSLT_CODE != '7000'
+				AND     C.MSG_TYPE = '8'
+			)	AS atFailCount ,
+			<!-- ( SELECT COUNT(0) 
+				FROM    MJ_MSG_DATA C
+				WHERE   C.DEL_FLAG     = 'N'
+				AND     C.RESERVE_C_YN = 'N'
+				AND     C.MSG_GROUP_ID = M2.msgGroupId
+				AND     C.RSLT_CODE = '7000'
+				AND     C.MSG_TYPE = '9'
+			)	AS ftSuccessCount ,
+			( SELECT COUNT(0) 
+				FROM    MJ_MSG_DATA C
+				WHERE   C.DEL_FLAG     = 'N'
+				AND     C.RESERVE_C_YN = 'N'
+				AND     C.MSG_GROUP_ID = M2.msgGroupId
+				AND     C.RSLT_CODE != '7000'
+				AND     C.MSG_TYPE = '9'
+			)	AS ftFailCount ,-->
+			'0' AS ftSuccessCount,
+			'0' AS ftFailCount,
+			M2.bizUmid,
+			M2.callStatus,
+			M2.bizKakaoResendYn,
 			( SELECT COUNT(0)
 			FROM    BIZ_LOG BL1,
 			 MJ_MSG_DATA MMD1
-			WHERE   M.BIZ_KAKAO_RESEND_YN = 'Y'
-			AND     M.MSG_GROUP_ID        = MMD1.MSG_GROUP_ID
+			WHERE   M2.bizKakaoResendYn = 'Y'
+			AND     M2.msgGroupId        = MMD1.MSG_GROUP_ID
 			AND     MMD1.BIZ_UMID         = BL1.CMID
 			AND     (
 					 CASE

 			( SELECT COUNT(0)
 			FROM    BIZ_LOG BL1,
 			 MJ_MSG_DATA MMD1
-			WHERE   M.BIZ_KAKAO_RESEND_YN = 'Y'
-			AND     M.MSG_GROUP_ID        = MMD1.MSG_GROUP_ID
+			WHERE   M2.bizKakaoResendYn = 'Y'
+			AND     M2.msgGroupId        = MMD1.MSG_GROUP_ID
 			AND     MMD1.BIZ_UMID         = BL1.CMID
 			AND     (
 					 CASE

 					 END ) = 'F'
 			) kakaoResendFailCount
 		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
-					WHEN MG.MSG_TYPE = '8'
-					THEN '1'
-					ELSE '2'
-				END orderByCode , 
-				(
+			SELECT
+				COUNT(M.USER_ID) OVER()					AS totCnt ,
+				M.USER_ID                             AS userId ,
+				MSG_GROUP_ID                          AS msgGroupId ,
+				MSG_GROUP_CNT                         AS msgGroupCnt ,
+				SMS_TXT                               AS smsTxt ,
+				M.SUBJECT                             AS subject ,
+				DATE_FORMAT(REGDATE, '%Y-%m-%d %T')   AS regDate ,
+				DATE_FORMAT(REQ_DATE, '%Y-%m-%d %T')  AS reqDate ,
+				DATE_FORMAT(RSLT_DATE, '%Y-%m-%d %T') AS rsltDate ,
+				CALL_FROM                             AS callFrom ,
+				CALL_TO                               AS callTo ,
+				TOT_PRICE                             AS totPrice ,
+				EACH_PRICE                            AS eachPrice ,
+				CUR_STATE                             AS curState ,
+				RSLT_CODE                             AS rsltCode ,
+				RSLT_CODE2                            AS rsltCode2 ,
+				IF((RSLT_CODE != '7000'),'1','0')     AS orderByrsltCode ,
+				DEL_FLAG                              AS delFlag ,
+				M.MSG_TYPE                            AS msgType ,
+				FILE_CNT                              AS fileCnt ,
+				AGENT_CODE                            AS agentCode ,
+				RESERVE_YN                            AS reserveYn ,
+				RESERVE_C_YN                          AS reserveCYn ,
+				CANCELDATE                            AS cancelDate ,
+				msgTypeName                           AS msgTypeName ,
+				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 ,
+				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
-						WHEN MD.RSLT_CODE = '7000'
-						THEN 'S'
-						WHEN (MD.RSLT_CODE IS NULL    AND     MD.SENT_DATE IS NULL   AND     MD.RSLT_DATE IS NULL)
-						THEN 'W'
-						ELSE 'F'
-					END 
-				) AS result ,
-				( SELECT COUNT(0) 
-					FROM    MJ_MSG_DATA C
-					WHERE   C.DEL_FLAG     = 'N'
-					AND     C.RESERVE_C_YN = 'N'
-					AND     C.MSG_GROUP_ID = MG.MSG_GROUP_ID
-					AND     C.RSLT_CODE = '7000'
-				)	AS successCount ,
-				( SELECT COUNT(0) 
-					FROM    MJ_MSG_DATA C
-					WHERE   C.DEL_FLAG     = 'N'
-					AND     C.RESERVE_C_YN = 'N'
-					AND     C.MSG_GROUP_ID = MG.MSG_GROUP_ID
-					AND     C.RSLT_CODE = '7000'
-					AND     C.MSG_TYPE = '8'
-				)	AS atSuccessCount ,
-				( SELECT COUNT(0) 
-					FROM    MJ_MSG_DATA C
-					WHERE   C.DEL_FLAG     = 'N'
-					AND     C.RESERVE_C_YN = 'N'
-					AND     C.MSG_GROUP_ID = MG.MSG_GROUP_ID
-					AND     C.RSLT_CODE = '7000'
-					AND     C.MSG_TYPE = '9'
-				)	AS ftSuccessCount ,
-				( SELECT COUNT(0) 
-					FROM    MJ_MSG_DATA C
-					WHERE   C.DEL_FLAG     = 'N'
-					AND     C.RESERVE_C_YN = 'N'
-					AND     C.MSG_GROUP_ID = MG.MSG_GROUP_ID
-					AND     C.RSLT_CODE != '7000'
-					AND     C.MSG_TYPE = '8'
-				)	AS atFailCount ,
-				( SELECT COUNT(0) 
-					FROM    MJ_MSG_DATA C
-					WHERE   C.DEL_FLAG     = 'N'
-					AND     C.RESERVE_C_YN = 'N'
-					AND     C.MSG_GROUP_ID = MG.MSG_GROUP_ID
-					AND     C.RSLT_CODE != '7000'
-					AND     C.MSG_TYPE = '9'
-				)	AS ftFailCount ,
-				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
-				AND IFNULL(MG.DEL_FLAG, 'N') = 'N'
-				AND MD.DEL_FLAG = 'N'
-			<isNotEmpty property="userId">
-				AND MG.USER_ID = #userId#
-			</isNotEmpty>
-				AND MG.DEL_FLAG ='N'
-				AND MG.RESERVE_C_YN = 'N'
-				AND MG.MSG_TYPE = '8'
-			)M
-			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
-			ON	M.BIZ_UMID = BL.CMID
-			WHERE 1=1
-			<isNotEmpty property="searchKeyword">
-				<isEqual property="searchCondition" compareValue="" >
-					AND ( 
-						M.USER_ID LIKE CONCAT('%', #searchKeyword#, '%')
-						OR   MKPI.YELLOW_ID LIKE CONCAT ('%', #searchKeyword#,'%')
-						OR   M.SMS_TXT LIKE CONCAT ('%', #searchKeyword#,'%')
-					)
-				</isEqual>
-				<isEqual property="searchCondition" compareValue="1">
-					AND M.USER_ID LIKE CONCAT('%', #searchKeyword#, '%')
-				</isEqual>
-				<isEqual property="searchCondition" compareValue="2">
-					AND MKPI.YELLOW_ID LIKE CONCAT ('%', #searchKeyword#,'%')
-				</isEqual>
-				<isEqual property="searchCondition" compareValue="3">
-					AND M.SMS_TXT LIKE CONCAT ('%', #searchKeyword#,'%')
-				</isEqual>
-				
-				<isEqual property="searchCondition2" compareValue="" >
-					AND M.RESERVE_YN IN ('Y','N')
-				</isEqual>
-				<isEqual property="searchCondition2" compareValue="N">
-					AND M.RESERVE_YN = 'N'
-				</isEqual>
-				<isEqual property="searchCondition2" compareValue="Y">
-					AND M.RESERVE_YN = 'Y'
-				</isEqual>
-			</isNotEmpty>
-			
-			<isEmpty property="searchKeyword">
-				<isNotEmpty property="searchCondition">
+						 WHEN MG.MSG_TYPE = '8'
+						 THEN '알림톡'
+						 WHEN MG.MSG_TYPE = '9'
+						 THEN '친구톡'
+					END msgTypeName ,
+					CASE
+						WHEN MG.MSG_TYPE = '8'
+						THEN '1'
+						ELSE '2'
+					END orderByCode , 
+					(
+						CASE
+							WHEN MD.RSLT_CODE = '7000'
+							THEN 'S'
+							WHEN (MD.RSLT_CODE IS NULL    AND     MD.SENT_DATE IS NULL   AND     MD.RSLT_DATE IS NULL)
+							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
+					AND IFNULL(MG.DEL_FLAG, 'N') = 'N'
+					AND MD.DEL_FLAG = 'N'
+				<isNotEmpty property="userId">
+					AND MG.USER_ID = #userId#
+				</isNotEmpty>
+					AND MG.DEL_FLAG ='N'
+					AND MG.RESERVE_C_YN = 'N'
+					AND MG.MSG_TYPE = '8'
+				)M
+				LEFT JOIN MJ_KAKAO_PROFILE_INFO MKPI
+				ON	M.MSG_NOTICETALK_SENDER_KEY = MKPI.SENDER_KEY 
+				AND MKPI.USER_ID = M.USER_ID
+				LEFT JOIN LETTNGNRLMBER LTM
+				ON	M.USER_ID = LTM.MBER_ID
+				LEFT JOIN BIZ_LOG BL
+				ON	M.BIZ_UMID = BL.CMID
+				WHERE 1=1
+				<isNotEmpty property="searchKeyword">
 					<isEqual property="searchCondition" compareValue="" >
 						AND ( 
 							M.USER_ID LIKE CONCAT('%', #searchKeyword#, '%')

 					<isEqual property="searchCondition" compareValue="3">
 						AND M.SMS_TXT LIKE CONCAT ('%', #searchKeyword#,'%')
 					</isEqual>
-				</isNotEmpty>
-				<isNotEmpty property="searchCondition2">
+					
 					<isEqual property="searchCondition2" compareValue="" >
 						AND M.RESERVE_YN IN ('Y','N')
 					</isEqual>

 						AND M.RESERVE_YN = 'Y'
 					</isEqual>
 				</isNotEmpty>
-			</isEmpty>
-			
-			
-			<isNotEmpty property="msgType">
-				<isEqual property="msgType" compareValue="8">
-					AND M.MSG_TYPE = '8'
+				
+				<isEmpty property="searchKeyword">
+					<isNotEmpty property="searchCondition">
+						<isEqual property="searchCondition" compareValue="" >
+							AND ( 
+								M.USER_ID LIKE CONCAT('%', #searchKeyword#, '%')
+								OR   MKPI.YELLOW_ID LIKE CONCAT ('%', #searchKeyword#,'%')
+								OR   M.SMS_TXT LIKE CONCAT ('%', #searchKeyword#,'%')
+							)
+						</isEqual>
+						<isEqual property="searchCondition" compareValue="1">
+							AND M.USER_ID LIKE CONCAT('%', #searchKeyword#, '%')
+						</isEqual>
+						<isEqual property="searchCondition" compareValue="2">
+							AND MKPI.YELLOW_ID LIKE CONCAT ('%', #searchKeyword#,'%')
+						</isEqual>
+						<isEqual property="searchCondition" compareValue="3">
+							AND M.SMS_TXT LIKE CONCAT ('%', #searchKeyword#,'%')
+						</isEqual>
+					</isNotEmpty>
+					<isNotEmpty property="searchCondition2">
+						<isEqual property="searchCondition2" compareValue="" >
+							AND M.RESERVE_YN IN ('Y','N')
+						</isEqual>
+						<isEqual property="searchCondition2" compareValue="N">
+							AND M.RESERVE_YN = 'N'
+						</isEqual>
+						<isEqual property="searchCondition2" compareValue="Y">
+							AND M.RESERVE_YN = 'Y'
+						</isEqual>
+					</isNotEmpty>
+				</isEmpty>
+				
+				
+				<isNotEmpty property="msgType">
+					<isEqual property="msgType" compareValue="8">
+						AND M.MSG_TYPE = '8'
+					</isEqual>
+					<isEqual property="msgType" compareValue="9">
+						AND M.MSG_TYPE = '9'
+					</isEqual>
+				</isNotEmpty>
+				<isEmpty property="msgType">
+						AND M.MSG_TYPE IN ('8','9')
+				</isEmpty>
+				<isNotEmpty property="ntceBgnde">
+					<![CDATA[ 
+						AND DATE_FORMAT(REGDATE, '%Y-%m-%d') >= DATE_FORMAT(#ntceBgnde#, '%Y-%m-%d')
+					]]>
+				</isNotEmpty>
+				<isNotEmpty property="ntceEndde">
+					<![CDATA[ 
+						AND 	DATE_FORMAT(REGDATE, '%Y-%m-%d')  <=  DATE_FORMAT(#ntceEndde#, '%Y-%m-%d')  
+					]]>
+				</isNotEmpty>
+			GROUP BY MSG_GROUP_ID
+			ORDER BY 1=1
+			<isNotEmpty property="searchSortCnd">
+				<isEqual property="searchSortCnd" compareValue="curState">
+					, curState  $searchSortOrd$
+					, orderByrsltCode
 				</isEqual>
-				<isEqual property="msgType" compareValue="9">
-					AND M.MSG_TYPE = '9'
-				</isEqual>
+				<isNotEqual  property="searchSortCnd" compareValue="curState">
+					,$searchSortCnd$
+				</isNotEqual>
 			</isNotEmpty>
-			<isEmpty property="msgType">
-					AND M.MSG_TYPE IN ('8','9')
-			</isEmpty>
-			<isNotEmpty property="ntceBgnde">
-				<![CDATA[ 
-					AND DATE_FORMAT(REGDATE, '%Y-%m-%d') >= DATE_FORMAT(#ntceBgnde#, '%Y-%m-%d')
-				]]>
+			<isNotEmpty property="searchSortOrd">
+				$searchSortOrd$
 			</isNotEmpty>
-			<isNotEmpty property="ntceEndde">
-				<![CDATA[ 
-					AND 	DATE_FORMAT(REGDATE, '%Y-%m-%d')  <=  DATE_FORMAT(#ntceEndde#, '%Y-%m-%d')  
-				]]>
-			</isNotEmpty>
-		GROUP BY MSG_GROUP_ID
-		ORDER BY 1=1
-		<isNotEmpty property="searchSortCnd">
-			<isEqual property="searchSortCnd" compareValue="curState">
-				, curState  $searchSortOrd$
-				, orderByrsltCode
-			</isEqual>
-			<isNotEqual  property="searchSortCnd" compareValue="curState">
-				,$searchSortCnd$
-			</isNotEqual>
-		</isNotEmpty>
-		<isNotEmpty property="searchSortOrd">
-			$searchSortOrd$
-		</isNotEmpty>
-		LIMIT  #recordCountPerPage# OFFSET #firstIndex#	
+			LIMIT  #recordCountPerPage# OFFSET #firstIndex#
+		) M2	
 	</select>	
 	
 	<!-- 알림톡 상세 리스트 조회 -->

Add a comment

Open 0
Closed 0

List

...	...	@@ -20,6 +20,7 @@
20	20	import itn.com.cmm.LoginVO;
21	21	import itn.com.cmm.service.EgovCmmUseService;
22	22	import itn.com.cmm.service.FileVO;
	23	+import itn.com.cmm.util.MJUtil;
23	24	import itn.com.cmm.util.StringUtil;
24	25	import itn.let.kakao.admin.kakaoAt.service.ChannelIDVO;
25	26	import itn.let.kakao.admin.kakaoAt.service.MjonKakaoATService;
...	...	@@ -231,7 +232,15 @@
231	232	kakaoVO.setReserveCYn("N");//예약취소건은 제외하기
232	233	// 문자발송 완료건은 모두 보이도록 처리
233	234	//kakaoVO.setMsgType("8");
234		- resultList = mjonKakaoATService.selectMjonKakaoATGroupCompleteList(kakaoVO);
	235	+
	236	+ // 기간검색 설정
	237	+ String toDay = MJUtil.getTodayDate(); //오늘
	238	+ String beforeMonthDay = MJUtil.getBefore1MonthDate(); //한달 전
	239	+ if (null == kakaoVO.getNtceBgnde() \|\| kakaoVO.getNtceBgnde().equals("")) {
	240	+ kakaoVO.setNtceBgnde(beforeMonthDay);
	241	+ }
	242	+
	243	+ resultList = mjonKakaoATService.selectMjonKakaoATGroupCompleteByUserList(kakaoVO);
235	244
236	245	model.addAttribute("resultList", resultList);
237	246

...	...	@@ -78,7 +78,6 @@
78	78	import itn.let.fax.user.service.FaxGroupDataVO;
79	79	import itn.let.fax.user.service.FaxService;
80	80	import itn.let.kakao.admin.kakaoAt.service.ChannelIDVO;
81		-import itn.let.kakao.admin.kakaoAt.service.MjonKakaoATSentVO;
82	81	import itn.let.kakao.admin.kakaoAt.service.MjonKakaoATService;
83	82	import itn.let.kakao.kakaoComm.KakaoReturnVO;
84	83	import itn.let.kakao.kakaoComm.KakaoVO;
...	...	@@ -1168,8 +1167,8 @@
1168	1167	* 최근 알리톡/친구톡 전송 내역
1169	1168	* */
1170	1169	//최근 발송 문자 내용 불러오기 - 최근 3개 내역만
1171		- List<MjonKakaoATSentVO> mjonKakaoATSentList = mjonKakaoATService.selectMberKakaoATSentLatestList(userId);
1172		- model.addAttribute("mjonKakaoATSentList", mjonKakaoATSentList);
	1170	+ //List<MjonKakaoATSentVO> mjonKakaoATSentList = mjonKakaoATService.selectMberKakaoATSentLatestList(userId);
	1171	+ //model.addAttribute("mjonKakaoATSentList", mjonKakaoATSentList);
1173	1172	}
1174	1173
1175	1174	{

...	...	@@ -208,7 +208,6 @@
208	208	LEFT JOIN MJ_KAKAO_PROFILE_INFO MKPI
209	209	ON M.MSG_NOTICETALK_SENDER_KEY = MKPI.SENDER_KEY
210	210	AND MKPI.USER_ID = M.USER_ID
211		- AND MKPI.DELETE_YN = 'N'
212	211	LEFT JOIN LETTNGNRLMBER LTM
213	212	ON M.USER_ID = LTM.MBER_ID
214	213	LEFT JOIN BIZ_LOG BL
...	...	@@ -519,7 +518,6 @@
519	518	LEFT JOIN MJ_KAKAO_PROFILE_INFO MKPI
520	519	ON M.MSG_NOTICETALK_SENDER_KEY = MKPI.SENDER_KEY
521	520	AND MKPI.USER_ID = M.USER_ID
522		- AND MKPI.DELETE_YN = 'N'
523	521	LEFT JOIN LETTNGNRLMBER LTM
524	522	ON M.USER_ID = LTM.MBER_ID
525	523	LEFT JOIN BIZ_LOG BL
...	...	@@ -1029,50 +1027,86 @@
1029	1027	<select id="mjonKakaoATDAO.selectReserveMjonKakaoATGroupList" parameterClass="kakaoVO" resultClass="kakaoVO">
1030	1028	/* mjonKakaoATDAO.selectMjonKakaoATGroupList - 알림톡 예약조회 */
1031	1029	SELECT
1032		- COUNT(M.USER_ID) OVER() AS totCnt ,
1033		- M.USER_ID AS userId ,
1034		- MSG_GROUP_ID AS msgGroupId ,
1035		- MSG_GROUP_CNT AS msgGroupCnt ,
1036		- SMS_TXT AS smsTxt ,
1037		- M.SUBJECT AS subject ,
1038		- DATE_FORMAT(REGDATE, '%Y-%m-%d %T') AS regDate ,
1039		- DATE_FORMAT(REQ_DATE, '%Y-%m-%d %T') AS reqDate ,
1040		- DATE_FORMAT(RSLT_DATE, '%Y-%m-%d %T') AS rsltDate ,
1041		- CALL_FROM AS callFrom ,
1042		- CALL_TO AS callTo ,
1043		- TOT_PRICE AS totPrice ,
1044		- EACH_PRICE AS eachPrice ,
1045		- CUR_STATE AS curState ,
1046		- RSLT_CODE AS rsltCode ,
1047		- RSLT_CODE2 AS rsltCode2 ,
1048		- IF((RSLT_CODE != '7000'),'1','0') AS orderByrsltCode ,
1049		- DEL_FLAG AS delFlag ,
1050		- M.MSG_TYPE AS msgType ,
1051		- FILE_CNT AS fileCnt ,
1052		- AGENT_CODE AS agentCode ,
1053		- RESERVE_YN AS reserveYn ,
1054		- RESERVE_C_YN AS reserveCYn ,
1055		- CANCELDATE AS cancelDate ,
1056		- msgTypeName AS msgTypeName ,
1057		- orderByCode AS orderByCode ,
1058		- RESULT AS msgResult ,
1059		- MSG_NOTICETALK_SENDER_KEY AS msgNoticetalkSenderKey ,
1060		- MSG_NOTICETALK_TMP_KEY AS msgNoticetalkTmpKey ,
1061		- MKPI.YELLOW_ID AS yellowId ,
1062		- LTM.MBER_NM AS userNm ,
1063		- successCount,
1064		- atSuccessCount,
1065		- ftSuccessCount,
1066		- atFailCount,
1067		- ftFailCount,
1068		- BIZ_UMID AS bizUmid,
1069		- BL.CALL_STATUS AS callStatus,
1070		- M.BIZ_KAKAO_RESEND_YN AS bizKakaoResendYn,
	1030	+ M2.totCnt ,
	1031	+ M2.userId ,
	1032	+ M2.msgGroupId ,
	1033	+ M2.msgGroupCnt ,
	1034	+ M2.smsTxt ,
	1035	+ M2.subject ,
	1036	+ M2.regDate ,
	1037	+ M2.reqDate ,
	1038	+ M2.rsltDate ,
	1039	+ M2.callFrom ,
	1040	+ M2.callTo ,
	1041	+ M2.totPrice ,
	1042	+ M2.eachPrice ,
	1043	+ M2.curState ,
	1044	+ M2.rsltCode ,
	1045	+ M2.rsltCode2 ,
	1046	+ M2.orderByrsltCode ,
	1047	+ M2.delFlag ,
	1048	+ M2.msgType ,
	1049	+ M2.fileCnt ,
	1050	+ M2.agentCode ,
	1051	+ M2.reserveYn ,
	1052	+ M2.reserveCYn ,
	1053	+ M2.cancelDate ,
	1054	+ M2.msgTypeName ,
	1055	+ M2.orderByCode ,
	1056	+ M2.msgResult ,
	1057	+ M2.msgNoticetalkSenderKey ,
	1058	+ M2.msgNoticetalkTmpKey ,
	1059	+ M2.yellowId ,
	1060	+ M2.userNm ,
	1061	+ ( SELECT COUNT(0)
	1062	+ FROM MJ_MSG_DATA C
	1063	+ WHERE C.DEL_FLAG = 'N'
	1064	+ AND C.RESERVE_C_YN = 'N'
	1065	+ AND C.MSG_GROUP_ID = M2.msgGroupId
	1066	+ AND C.RSLT_CODE = '7000'
	1067	+ ) AS successCount ,
	1068	+ ( SELECT COUNT(0)
	1069	+ FROM MJ_MSG_DATA C
	1070	+ WHERE C.DEL_FLAG = 'N'
	1071	+ AND C.RESERVE_C_YN = 'N'
	1072	+ AND C.MSG_GROUP_ID = M2.msgGroupId
	1073	+ AND C.RSLT_CODE = '7000'
	1074	+ AND C.MSG_TYPE = '8'
	1075	+ ) AS atSuccessCount ,
	1076	+ ( SELECT COUNT(0)
	1077	+ FROM MJ_MSG_DATA C
	1078	+ WHERE C.DEL_FLAG = 'N'
	1079	+ AND C.RESERVE_C_YN = 'N'
	1080	+ AND C.MSG_GROUP_ID = M2.msgGroupId
	1081	+ AND C.RSLT_CODE != '7000'
	1082	+ AND C.MSG_TYPE = '8'
	1083	+ ) AS atFailCount ,
	1084	+ <!-- ( SELECT COUNT(0)
	1085	+ FROM MJ_MSG_DATA C
	1086	+ WHERE C.DEL_FLAG = 'N'
	1087	+ AND C.RESERVE_C_YN = 'N'
	1088	+ AND C.MSG_GROUP_ID = M2.msgGroupId
	1089	+ AND C.RSLT_CODE = '7000'
	1090	+ AND C.MSG_TYPE = '9'
	1091	+ ) AS ftSuccessCount ,
	1092	+ ( SELECT COUNT(0)
	1093	+ FROM MJ_MSG_DATA C
	1094	+ WHERE C.DEL_FLAG = 'N'
	1095	+ AND C.RESERVE_C_YN = 'N'
	1096	+ AND C.MSG_GROUP_ID = M2.msgGroupId
	1097	+ AND C.RSLT_CODE != '7000'
	1098	+ AND C.MSG_TYPE = '9'
	1099	+ ) AS ftFailCount ,-->
	1100	+ '0' AS ftSuccessCount,
	1101	+ '0' AS ftFailCount,
	1102	+ M2.bizUmid,
	1103	+ M2.callStatus,
	1104	+ M2.bizKakaoResendYn,
1071	1105	( SELECT COUNT(0)
1072	1106	FROM BIZ_LOG BL1,
1073	1107	MJ_MSG_DATA MMD1
1074		- WHERE M.BIZ_KAKAO_RESEND_YN = 'Y'
1075		- AND M.MSG_GROUP_ID = MMD1.MSG_GROUP_ID
	1108	+ WHERE M2.bizKakaoResendYn = 'Y'
	1109	+ AND M2.msgGroupId = MMD1.MSG_GROUP_ID
1076	1110	AND MMD1.BIZ_UMID = BL1.CMID
1077	1111	AND (
1078	1112	CASE
...	...	@@ -1084,8 +1118,8 @@
1084	1118	( SELECT COUNT(0)
1085	1119	FROM BIZ_LOG BL1,
1086	1120	MJ_MSG_DATA MMD1
1087		- WHERE M.BIZ_KAKAO_RESEND_YN = 'Y'
1088		- AND M.MSG_GROUP_ID = MMD1.MSG_GROUP_ID
	1121	+ WHERE M2.bizKakaoResendYn = 'Y'
	1122	+ AND M2.msgGroupId = MMD1.MSG_GROUP_ID
1089	1123	AND MMD1.BIZ_UMID = BL1.CMID
1090	1124	AND (
1091	1125	CASE
...	...	@@ -1095,144 +1129,110 @@
1095	1129	END ) = 'F'
1096	1130	) kakaoResendFailCount
1097	1131	FROM (
1098		- SELECT MG.USER_ID ,
1099		- MG.MSG_GROUP_ID ,
1100		- MG.MSG_GROUP_CNT ,
1101		- MG.SMS_TXT ,
1102		- MG.SUBJECT ,
1103		- MG.REGDATE ,
1104		- MG.REQ_DATE ,
1105		- MD.RSLT_DATE ,
1106		- MG.CALL_FROM ,
1107		- MG.TOT_PRICE ,
1108		- MG.EACH_PRICE ,
1109		- MG.DEL_FLAG ,
1110		- MG.MSG_TYPE ,
1111		- MG.FILE_CNT ,
1112		- MG.AGENT_CODE ,
1113		- MG.RESERVE_YN ,
1114		- MG.RESERVE_C_YN ,
1115		- MG.CANCELDATE ,
1116		- MD.MSG_SEQ ,
1117		- MD.CALL_TO ,
1118		- MD.CUR_STATE ,
1119		- MD.RSLT_CODE ,
1120		- MD.RSLT_CODE2 ,
1121		- CASE
1122		- WHEN MG.MSG_TYPE = '8'
1123		- THEN '알림톡'
1124		- WHEN MG.MSG_TYPE = '9'
1125		- THEN '친구톡'
1126		- END msgTypeName ,
1127		- CASE
1128		- WHEN MG.MSG_TYPE = '8'
1129		- THEN '1'
1130		- ELSE '2'
1131		- END orderByCode ,
1132		- (
	1132	+ SELECT
	1133	+ COUNT(M.USER_ID) OVER() AS totCnt ,
	1134	+ M.USER_ID AS userId ,
	1135	+ MSG_GROUP_ID AS msgGroupId ,
	1136	+ MSG_GROUP_CNT AS msgGroupCnt ,
	1137	+ SMS_TXT AS smsTxt ,
	1138	+ M.SUBJECT AS subject ,
	1139	+ DATE_FORMAT(REGDATE, '%Y-%m-%d %T') AS regDate ,
	1140	+ DATE_FORMAT(REQ_DATE, '%Y-%m-%d %T') AS reqDate ,
	1141	+ DATE_FORMAT(RSLT_DATE, '%Y-%m-%d %T') AS rsltDate ,
	1142	+ CALL_FROM AS callFrom ,
	1143	+ CALL_TO AS callTo ,
	1144	+ TOT_PRICE AS totPrice ,
	1145	+ EACH_PRICE AS eachPrice ,
	1146	+ CUR_STATE AS curState ,
	1147	+ RSLT_CODE AS rsltCode ,
	1148	+ RSLT_CODE2 AS rsltCode2 ,
	1149	+ IF((RSLT_CODE != '7000'),'1','0') AS orderByrsltCode ,
	1150	+ DEL_FLAG AS delFlag ,
	1151	+ M.MSG_TYPE AS msgType ,
	1152	+ FILE_CNT AS fileCnt ,
	1153	+ AGENT_CODE AS agentCode ,
	1154	+ RESERVE_YN AS reserveYn ,
	1155	+ RESERVE_C_YN AS reserveCYn ,
	1156	+ CANCELDATE AS cancelDate ,
	1157	+ msgTypeName AS msgTypeName ,
	1158	+ orderByCode AS orderByCode ,
	1159	+ RESULT AS msgResult ,
	1160	+ 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 ,
	1164	+ BIZ_UMID AS bizUmid,
	1165	+ BL.CALL_STATUS AS callStatus,
	1166	+ M.BIZ_KAKAO_RESEND_YN AS bizKakaoResendYn
	1167	+ FROM (
	1168	+ SELECT MG.USER_ID ,
	1169	+ MG.MSG_GROUP_ID ,
	1170	+ MG.MSG_GROUP_CNT ,
	1171	+ MG.SMS_TXT ,
	1172	+ MG.SUBJECT ,
	1173	+ MG.REGDATE ,
	1174	+ MG.REQ_DATE ,
	1175	+ MD.RSLT_DATE ,
	1176	+ MG.CALL_FROM ,
	1177	+ MG.TOT_PRICE ,
	1178	+ MG.EACH_PRICE ,
	1179	+ MG.DEL_FLAG ,
	1180	+ MG.MSG_TYPE ,
	1181	+ MG.FILE_CNT ,
	1182	+ MG.AGENT_CODE ,
	1183	+ MG.RESERVE_YN ,
	1184	+ MG.RESERVE_C_YN ,
	1185	+ MG.CANCELDATE ,
	1186	+ MD.MSG_SEQ ,
	1187	+ MD.CALL_TO ,
	1188	+ MD.CUR_STATE ,
	1189	+ MD.RSLT_CODE ,
	1190	+ MD.RSLT_CODE2 ,
1133	1191	CASE
1134		- WHEN MD.RSLT_CODE = '7000'
1135		- THEN 'S'
1136		- WHEN (MD.RSLT_CODE IS NULL AND MD.SENT_DATE IS NULL AND MD.RSLT_DATE IS NULL)
1137		- THEN 'W'
1138		- ELSE 'F'
1139		- END
1140		- ) AS result ,
1141		- ( SELECT COUNT(0)
1142		- FROM MJ_MSG_DATA C
1143		- WHERE C.DEL_FLAG = 'N'
1144		- AND C.RESERVE_C_YN = 'N'
1145		- AND C.MSG_GROUP_ID = MG.MSG_GROUP_ID
1146		- AND C.RSLT_CODE = '7000'
1147		- ) AS successCount ,
1148		- ( SELECT COUNT(0)
1149		- FROM MJ_MSG_DATA C
1150		- WHERE C.DEL_FLAG = 'N'
1151		- AND C.RESERVE_C_YN = 'N'
1152		- AND C.MSG_GROUP_ID = MG.MSG_GROUP_ID
1153		- AND C.RSLT_CODE = '7000'
1154		- AND C.MSG_TYPE = '8'
1155		- ) AS atSuccessCount ,
1156		- ( SELECT COUNT(0)
1157		- FROM MJ_MSG_DATA C
1158		- WHERE C.DEL_FLAG = 'N'
1159		- AND C.RESERVE_C_YN = 'N'
1160		- AND C.MSG_GROUP_ID = MG.MSG_GROUP_ID
1161		- AND C.RSLT_CODE = '7000'
1162		- AND C.MSG_TYPE = '9'
1163		- ) AS ftSuccessCount ,
1164		- ( SELECT COUNT(0)
1165		- FROM MJ_MSG_DATA C
1166		- WHERE C.DEL_FLAG = 'N'
1167		- AND C.RESERVE_C_YN = 'N'
1168		- AND C.MSG_GROUP_ID = MG.MSG_GROUP_ID
1169		- AND C.RSLT_CODE != '7000'
1170		- AND C.MSG_TYPE = '8'
1171		- ) AS atFailCount ,
1172		- ( SELECT COUNT(0)
1173		- FROM MJ_MSG_DATA C
1174		- WHERE C.DEL_FLAG = 'N'
1175		- AND C.RESERVE_C_YN = 'N'
1176		- AND C.MSG_GROUP_ID = MG.MSG_GROUP_ID
1177		- AND C.RSLT_CODE != '7000'
1178		- AND C.MSG_TYPE = '9'
1179		- ) AS ftFailCount ,
1180		- MSG_NOTICETALK_SENDER_KEY ,
1181		- MSG_NOTICETALK_TMP_KEY,
1182		- MD.BIZ_UMID,
1183		- MD.BIZ_KAKAO_RESEND_YN
1184		- FROM MJ_MSG_DATA MD ,
1185		- MJ_MSG_GROUP_DATA MG
1186		- WHERE MD.MSG_GROUP_ID = MG.MSG_GROUP_ID
1187		- AND IFNULL(MG.DEL_FLAG, 'N') = 'N'
1188		- AND MD.DEL_FLAG = 'N'
1189		- <isNotEmpty property="userId">
1190		- AND MG.USER_ID = #userId#
1191		- </isNotEmpty>
1192		- AND MG.DEL_FLAG ='N'
1193		- AND MG.RESERVE_C_YN = 'N'
1194		- AND MG.MSG_TYPE = '8'
1195		- )M
1196		- LEFT JOIN MJ_KAKAO_PROFILE_INFO MKPI
1197		- ON M.MSG_NOTICETALK_SENDER_KEY = MKPI.SENDER_KEY
1198		- AND MKPI.USER_ID = M.USER_ID
1199		- AND MKPI.DELETE_YN = 'N'
1200		- LEFT JOIN LETTNGNRLMBER LTM
1201		- ON M.USER_ID = LTM.MBER_ID
1202		- LEFT JOIN BIZ_LOG BL
1203		- ON M.BIZ_UMID = BL.CMID
1204		- WHERE 1=1
1205		- <isNotEmpty property="searchKeyword">
1206		- <isEqual property="searchCondition" compareValue="" >
1207		- AND (
1208		- M.USER_ID LIKE CONCAT('%', #searchKeyword#, '%')
1209		- OR MKPI.YELLOW_ID LIKE CONCAT ('%', #searchKeyword#,'%')
1210		- OR M.SMS_TXT LIKE CONCAT ('%', #searchKeyword#,'%')
1211		- )
1212		- </isEqual>
1213		- <isEqual property="searchCondition" compareValue="1">
1214		- AND M.USER_ID LIKE CONCAT('%', #searchKeyword#, '%')
1215		- </isEqual>
1216		- <isEqual property="searchCondition" compareValue="2">
1217		- AND MKPI.YELLOW_ID LIKE CONCAT ('%', #searchKeyword#,'%')
1218		- </isEqual>
1219		- <isEqual property="searchCondition" compareValue="3">
1220		- AND M.SMS_TXT LIKE CONCAT ('%', #searchKeyword#,'%')
1221		- </isEqual>
1222		-
1223		- <isEqual property="searchCondition2" compareValue="" >
1224		- AND M.RESERVE_YN IN ('Y','N')
1225		- </isEqual>
1226		- <isEqual property="searchCondition2" compareValue="N">
1227		- AND M.RESERVE_YN = 'N'
1228		- </isEqual>
1229		- <isEqual property="searchCondition2" compareValue="Y">
1230		- AND M.RESERVE_YN = 'Y'
1231		- </isEqual>
1232		- </isNotEmpty>
1233		-
1234		- <isEmpty property="searchKeyword">
1235		- <isNotEmpty property="searchCondition">
	1192	+ WHEN MG.MSG_TYPE = '8'
	1193	+ THEN '알림톡'
	1194	+ WHEN MG.MSG_TYPE = '9'
	1195	+ THEN '친구톡'
	1196	+ END msgTypeName ,
	1197	+ CASE
	1198	+ WHEN MG.MSG_TYPE = '8'
	1199	+ THEN '1'
	1200	+ ELSE '2'
	1201	+ END orderByCode ,
	1202	+ (
	1203	+ CASE
	1204	+ WHEN MD.RSLT_CODE = '7000'
	1205	+ THEN 'S'
	1206	+ WHEN (MD.RSLT_CODE IS NULL AND MD.SENT_DATE IS NULL AND MD.RSLT_DATE IS NULL)
	1207	+ THEN 'W'
	1208	+ ELSE 'F'
	1209	+ END
	1210	+ ) AS result ,
	1211	+ MSG_NOTICETALK_SENDER_KEY ,
	1212	+ MSG_NOTICETALK_TMP_KEY,
	1213	+ MD.BIZ_UMID,
	1214	+ MD.BIZ_KAKAO_RESEND_YN
	1215	+ FROM MJ_MSG_DATA MD ,
	1216	+ MJ_MSG_GROUP_DATA MG
	1217	+ WHERE MD.MSG_GROUP_ID = MG.MSG_GROUP_ID
	1218	+ AND IFNULL(MG.DEL_FLAG, 'N') = 'N'
	1219	+ AND MD.DEL_FLAG = 'N'
	1220	+ <isNotEmpty property="userId">
	1221	+ AND MG.USER_ID = #userId#
	1222	+ </isNotEmpty>
	1223	+ AND MG.DEL_FLAG ='N'
	1224	+ AND MG.RESERVE_C_YN = 'N'
	1225	+ AND MG.MSG_TYPE = '8'
	1226	+ )M
	1227	+ LEFT JOIN MJ_KAKAO_PROFILE_INFO MKPI
	1228	+ ON M.MSG_NOTICETALK_SENDER_KEY = MKPI.SENDER_KEY
	1229	+ AND MKPI.USER_ID = M.USER_ID
	1230	+ LEFT JOIN LETTNGNRLMBER LTM
	1231	+ ON M.USER_ID = LTM.MBER_ID
	1232	+ LEFT JOIN BIZ_LOG BL
	1233	+ ON M.BIZ_UMID = BL.CMID
	1234	+ WHERE 1=1
	1235	+ <isNotEmpty property="searchKeyword">
1236	1236	<isEqual property="searchCondition" compareValue="" >
1237	1237	AND (
1238	1238	M.USER_ID LIKE CONCAT('%', #searchKeyword#, '%')
...	...	@@ -1249,8 +1249,7 @@
1249	1249	<isEqual property="searchCondition" compareValue="3">
1250	1250	AND M.SMS_TXT LIKE CONCAT ('%', #searchKeyword#,'%')
1251	1251	</isEqual>
1252		- </isNotEmpty>
1253		- <isNotEmpty property="searchCondition2">
	1252	+
1254	1253	<isEqual property="searchCondition2" compareValue="" >
1255	1254	AND M.RESERVE_YN IN ('Y','N')
1256	1255	</isEqual>
...	...	@@ -1261,45 +1260,77 @@
1261	1260	AND M.RESERVE_YN = 'Y'
1262	1261	</isEqual>
1263	1262	</isNotEmpty>
1264		- </isEmpty>
1265		-
1266		-
1267		- <isNotEmpty property="msgType">
1268		- <isEqual property="msgType" compareValue="8">
1269		- AND M.MSG_TYPE = '8'
	1263	+
	1264	+ <isEmpty property="searchKeyword">
	1265	+ <isNotEmpty property="searchCondition">
	1266	+ <isEqual property="searchCondition" compareValue="" >
	1267	+ AND (
	1268	+ M.USER_ID LIKE CONCAT('%', #searchKeyword#, '%')
	1269	+ OR MKPI.YELLOW_ID LIKE CONCAT ('%', #searchKeyword#,'%')
	1270	+ OR M.SMS_TXT LIKE CONCAT ('%', #searchKeyword#,'%')
	1271	+ )
	1272	+ </isEqual>
	1273	+ <isEqual property="searchCondition" compareValue="1">
	1274	+ AND M.USER_ID LIKE CONCAT('%', #searchKeyword#, '%')
	1275	+ </isEqual>
	1276	+ <isEqual property="searchCondition" compareValue="2">
	1277	+ AND MKPI.YELLOW_ID LIKE CONCAT ('%', #searchKeyword#,'%')
	1278	+ </isEqual>
	1279	+ <isEqual property="searchCondition" compareValue="3">
	1280	+ AND M.SMS_TXT LIKE CONCAT ('%', #searchKeyword#,'%')
	1281	+ </isEqual>
	1282	+ </isNotEmpty>
	1283	+ <isNotEmpty property="searchCondition2">
	1284	+ <isEqual property="searchCondition2" compareValue="" >
	1285	+ AND M.RESERVE_YN IN ('Y','N')
	1286	+ </isEqual>
	1287	+ <isEqual property="searchCondition2" compareValue="N">
	1288	+ AND M.RESERVE_YN = 'N'
	1289	+ </isEqual>
	1290	+ <isEqual property="searchCondition2" compareValue="Y">
	1291	+ AND M.RESERVE_YN = 'Y'
	1292	+ </isEqual>
	1293	+ </isNotEmpty>
	1294	+ </isEmpty>
	1295	+
	1296	+
	1297	+ <isNotEmpty property="msgType">
	1298	+ <isEqual property="msgType" compareValue="8">
	1299	+ AND M.MSG_TYPE = '8'
	1300	+ </isEqual>
	1301	+ <isEqual property="msgType" compareValue="9">
	1302	+ AND M.MSG_TYPE = '9'
	1303	+ </isEqual>
	1304	+ </isNotEmpty>
	1305	+ <isEmpty property="msgType">
	1306	+ AND M.MSG_TYPE IN ('8','9')
	1307	+ </isEmpty>
	1308	+ <isNotEmpty property="ntceBgnde">
	1309	+ <![CDATA[
	1310	+ AND DATE_FORMAT(REGDATE, '%Y-%m-%d') >= DATE_FORMAT(#ntceBgnde#, '%Y-%m-%d')
	1311	+ ]]>
	1312	+ </isNotEmpty>
	1313	+ <isNotEmpty property="ntceEndde">
	1314	+ <![CDATA[
	1315	+ AND DATE_FORMAT(REGDATE, '%Y-%m-%d') <= DATE_FORMAT(#ntceEndde#, '%Y-%m-%d')
	1316	+ ]]>
	1317	+ </isNotEmpty>
	1318	+ GROUP BY MSG_GROUP_ID
	1319	+ ORDER BY 1=1
	1320	+ <isNotEmpty property="searchSortCnd">
	1321	+ <isEqual property="searchSortCnd" compareValue="curState">
	1322	+ , curState $searchSortOrd$
	1323	+ , orderByrsltCode
1270	1324	</isEqual>
1271		- <isEqual property="msgType" compareValue="9">
1272		- AND M.MSG_TYPE = '9'
1273		- </isEqual>
	1325	+ <isNotEqual property="searchSortCnd" compareValue="curState">
	1326	+ ,$searchSortCnd$
	1327	+ </isNotEqual>
1274	1328	</isNotEmpty>
1275		- <isEmpty property="msgType">
1276		- AND M.MSG_TYPE IN ('8','9')
1277		- </isEmpty>
1278		- <isNotEmpty property="ntceBgnde">
1279		- <![CDATA[
1280		- AND DATE_FORMAT(REGDATE, '%Y-%m-%d') >= DATE_FORMAT(#ntceBgnde#, '%Y-%m-%d')
1281		- ]]>
	1329	+ <isNotEmpty property="searchSortOrd">
	1330	+ $searchSortOrd$
1282	1331	</isNotEmpty>
1283		- <isNotEmpty property="ntceEndde">
1284		- <![CDATA[
1285		- AND DATE_FORMAT(REGDATE, '%Y-%m-%d') <= DATE_FORMAT(#ntceEndde#, '%Y-%m-%d')
1286		- ]]>
1287		- </isNotEmpty>
1288		- GROUP BY MSG_GROUP_ID
1289		- ORDER BY 1=1
1290		- <isNotEmpty property="searchSortCnd">
1291		- <isEqual property="searchSortCnd" compareValue="curState">
1292		- , curState $searchSortOrd$
1293		- , orderByrsltCode
1294		- </isEqual>
1295		- <isNotEqual property="searchSortCnd" compareValue="curState">
1296		- ,$searchSortCnd$
1297		- </isNotEqual>
1298		- </isNotEmpty>
1299		- <isNotEmpty property="searchSortOrd">
1300		- $searchSortOrd$
1301		- </isNotEmpty>
1302		- LIMIT #recordCountPerPage# OFFSET #firstIndex#
	1332	+ LIMIT #recordCountPerPage# OFFSET #firstIndex#
	1333	+ ) M2
1303	1334	</select>
1304	1335
1305	1336	<!-- 알림톡 상세 리스트 조회 -->

Delete comment