From 3cacf09142a70f7d564a74ef849f8f71c6b9aad6 Mon Sep 17 00:00:00 2001 From: JIWOO Date: Wed, 25 Jun 2025 11:47:43 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=EC=9E=90=20>=20=EC=95=8C=EB=A6=BC=ED=86=A1/=EC=B9=9C?= =?UTF-8?q?=EA=B5=AC=ED=86=A1=20=EA=B4=80=EB=A6=AC=20>=20=EC=95=8C?= =?UTF-8?q?=EB=A6=BC=ED=86=A1=20=EC=98=88=EC=95=BD=EC=A1=B0=ED=9A=8C=20>?= =?UTF-8?q?=20=EC=83=81=EC=84=B8=EC=97=90=20=EB=B0=9C=EC=86=A1=EA=B2=B0?= =?UTF-8?q?=EA=B3=BC=20=EA=B2=80=EC=83=89=EC=A1=B0=EA=B1=B4=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kakaoAt/web/MjonKakaoATController.java | 5 ++- .../let/kakao/MjonKakaoATData_SQL_mysql.xml | 38 +++++++++++++++++-- .../let/mjo/kakao/KakaoSent_SQL_Mysql.xml | 9 +++++ .../ion/kakaoat/ReserveKakaoATDetailList.jsp | 7 ++++ .../uss/ion/kakaoat/ReserveKakaoATList.jsp | 2 +- 5 files changed, 56 insertions(+), 5 deletions(-) diff --git a/src/main/java/itn/let/kakao/admin/kakaoAt/web/MjonKakaoATController.java b/src/main/java/itn/let/kakao/admin/kakaoAt/web/MjonKakaoATController.java index 0277f84..27f0e20 100644 --- a/src/main/java/itn/let/kakao/admin/kakaoAt/web/MjonKakaoATController.java +++ b/src/main/java/itn/let/kakao/admin/kakaoAt/web/MjonKakaoATController.java @@ -273,6 +273,7 @@ public class MjonKakaoATController { KakaoVO mjonKakaoATDetailVO = new KakaoVO(); if(null != searchVO.getUserData() && !"".equals(searchVO.getUserData())) { //수정 // mjonKakaoATDetailVO = mjonKakaoATService.selectMjonKakaoATVO(searchVO); + //user_ID, DEL_FLAG 체크 없는 쿼리 호출 mjonKakaoATDetailVO = mjonKakaoATService.selectMjonKakaoATVO_advc(searchVO); } @@ -446,7 +447,9 @@ public class MjonKakaoATController { KakaoVO mjonKakaoATDetailVO = new KakaoVO(); if(null != searchVO.getUserData() && !"".equals(searchVO.getUserData())) { //수정 - mjonKakaoATDetailVO = mjonKakaoATService.selectMjonKakaoATVO(searchVO); + //mjonKakaoATDetailVO = mjonKakaoATService.selectMjonKakaoATVO(searchVO); + //user_ID, DEL_FLAG 체크 없는 쿼리 호출 + mjonKakaoATDetailVO = mjonKakaoATService.selectMjonKakaoATVO_advc(searchVO); } model.addAttribute("mjonKakaoATDetailVO", mjonKakaoATDetailVO); diff --git a/src/main/resources/egovframework/sqlmap/let/kakao/MjonKakaoATData_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/kakao/MjonKakaoATData_SQL_mysql.xml index a2de16f..5629c3d 100644 --- a/src/main/resources/egovframework/sqlmap/let/kakao/MjonKakaoATData_SQL_mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/kakao/MjonKakaoATData_SQL_mysql.xml @@ -18,6 +18,27 @@ WHERE C.DEL_FLAG = 'N' AND C.RESERVE_C_YN = 'N' AND C.MSG_GROUP_ID = B.MSG_GROUP_ID + AND ( + CASE + WHEN C.AGENT_CODE = '01' AND (C.RSLT_CODE = '100' AND (C.RSLT_CODE2 = '0')) + THEN 'S' + WHEN C.AGENT_CODE = '02' AND (C.RSLT_CODE = '0') + THEN 'S' + WHEN C.AGENT_CODE = '03' AND (C.RSLT_CODE = '100' OR C.RSLT_CODE = '101' OR C.RSLT_CODE = '110' OR C.RSLT_CODE = '800') + THEN 'S' + WHEN C.AGENT_CODE = '04' AND (C.RSLT_CODE = '7000') + THEN 'S' + ELSE 'F' + END + ) = 'S' + + + + + SELECT COUNT(0) + FROM MJ_MSG_DATA C + WHERE C.RESERVE_C_YN = 'N' + AND C.MSG_GROUP_ID = B.MSG_GROUP_ID AND ( CASE WHEN C.AGENT_CODE = '01' AND (C.RSLT_CODE = '100' AND (C.RSLT_CODE2 = '0')) @@ -1630,7 +1651,7 @@ ELSE '2' END orderByCode , () AS RESULT - , () AS successCount + , () AS successCount , A.MSG_NOTICETALK_SENDER_KEY , A.MSG_NOTICETALK_TMP_KEY , CASE @@ -1646,12 +1667,12 @@ , A.BIZ_KAKAO_RESEND_DATA , A.BIZ_KAKAO_JSON_FILE , A.BIZ_UMID - + AND B.USER_ID = #userId# AND A.MSG_GROUP_ID = #msgGroupId# - AND B.DEL_FLAG ='N' + AND B.RESERVE_C_YN = 'N' AND B.RESERVE_YN = 'Y' @@ -1756,6 +1777,17 @@ AND DATE_FORMAT(REGDATE, '%Y-%m-%d') <= DATE_FORMAT(#ntceEndde#, '%Y-%m-%d') ]]> + + + AND M.result = 'S' + + + AND M.result = 'W' + + + AND M.result = 'F' + + ORDER BY 1=1 diff --git a/src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml index 00b94da..22b1420 100644 --- a/src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml @@ -23,6 +23,15 @@ AND A.DEL_FLAG = 'N' + + + FROM + MJ_MSG_DATA A + , MJ_MSG_GROUP_DATA B + WHERE + A.MSG_GROUP_ID = B.MSG_GROUP_ID + + CASE diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/ReserveKakaoATDetailList.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/ReserveKakaoATDetailList.jsp index 0ca828e..006efeb 100644 --- a/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/ReserveKakaoATDetailList.jsp +++ b/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/ReserveKakaoATDetailList.jsp @@ -207,6 +207,13 @@ function fnSelectMber(mberId) { + + + diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/ReserveKakaoATList.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/ReserveKakaoATList.jsp index c81ae0c..cda6670 100644 --- a/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/ReserveKakaoATList.jsp +++ b/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/ReserveKakaoATList.jsp @@ -530,7 +530,7 @@ function fnSmishingUpdate(flag) { <%-- ', ''); return false;" style="cursor:pointer;" class="smishing"> --%> - ', ''); return false;" style="cursor:pointer;line-height:30px;text-align:right;" class="smishing"> + ', ''); return false;" style="cursor:pointer;" class="smishing"> (%)