From ec20d76be5460f5edc9f41c39f13ff36bc28835a Mon Sep 17 00:00:00 2001
From: jiwoo <jiwoo@DESKTOP-SIDMR4Q>
Date: Wed, 21 Jun 2023 15:29:19 +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=EC=A1=B0=EC=A0=95=EC=A7=84=ED=96=89?=
 =?UTF-8?q?=EB=AA=A9=EB=A1=9D=20=EC=97=91=EC=85=80=20=EB=8B=A4=EC=9A=B4?=
 =?UTF-8?q?=EB=A1=9C=EB=93=9C=20=EB=AA=A9=EB=A1=9D=20=EC=BF=BC=EB=A6=AC=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95(=EA=B8=B0=EA=B0=84=20=EA=B2=80=EC=83=89=20?=
 =?UTF-8?q?=EC=A0=81=EC=9A=A9)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kccadr/adjPgrMgr/cmm/Cmm_SQL_Mysql.xml    | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cmm/Cmm_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cmm/Cmm_SQL_Mysql.xml
index 0e597e09..b2f0d4e8 100644
--- a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cmm/Cmm_SQL_Mysql.xml
+++ b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cmm/Cmm_SQL_Mysql.xml
@@ -1409,7 +1409,12 @@
 	<select id="Cmm.selectPgrCmmListForExcel" resultClass="kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmVO">
     <!--   -->
 	  SELECT ROW_NUMBER() OVER ( ORDER BY M.ADR_NO IS NULL DESC, M.ADR_NO DESC, M.SBMT_DE DESC ) rnum ,
-	         TO_CHAR ( M.SBMT_DE, 'YYYY/MM/DD' ) AS sbmtDeDay
+	         CASE
+	                  WHEN M.req_ol_cd = 2
+	                  THEN TO_CHAR ( M.frst_regist_pnttm , 'YYYY/MM/DD' )
+	                  ELSE TO_CHAR ( M.SBMT_DE, 'YYYY/MM/DD' )
+	         END       AS sbmtDeDay 
+	         <!-- TO_CHAR ( M.SBMT_DE, 'YYYY/MM/DD' ) AS sbmtDeDay -->
 	         /* 신청일 */
 	         ,
 	         RCD.CODE_NM AS reqOlCdTx
@@ -1485,7 +1490,16 @@
 	        LEFT JOIN LETTCCMMNDETAILCODE CCD ON CCD.CODE_ID     = 'CC002' AND CCD.CODE = TRIM ( M.CC_TY )
 	        LEFT JOIN ADR_MEM_DEPT_MGR DM     ON DM.MEM_DEPT_SEQ = D.MEM_DEPT_SEQ
 	        LEFT JOIN ADR_RPPL AP             ON AP.ADR_SEQ      = M.ADR_SEQ AND AP.RPPL_TY = '10'
-	        LEFT JOIN ADR_RPPL AP2 			  ON AP2.ADR_SEQ	 = M.ADR_SEQ AND AP2.RPPL_TY = '30'
+	        LEFT JOIN (SELECT RPPL_NM,
+                          RPPL_PHONE,
+                          RPPL_EMAIL,
+                          rppl_email_yn,
+                          RPPL_SMS_YN,
+                          ADR_SEQ,
+                          RPPL_TY
+                  FROM    ADR_RPPL t1
+                  WHERE   t1.rppl_nm != ''
+                  ) AP2 			  ON AP2.ADR_SEQ	 = M.ADR_SEQ AND AP2.RPPL_TY = '30'
 	        LEFT JOIN
                   (  SELECT ADR_SEQ
                          , ADR_SN
@@ -1519,7 +1533,8 @@
 		</isEqual>
 
 	     WHERE 1=1
-<!-- 	     TO_CHAR ( M.SBMT_DE, 'YYYYMMDD' ) BETWEEN    #searchStartDt# AND #searchEndDt# -->
+	     <!-- AND TO_CHAR ( M.SBMT_DE, 'YYYYMMDD' ) BETWEEN    #searchStartDt# AND #searchEndDt# -->
+	     AND      IF(M.REQ_OL_CD = 2, TO_CHAR ( M.frst_regist_pnttm, 'YYYYMMDD' ) BETWEEN #searchStartDt# AND      #searchEndDt#,TO_CHAR ( M.SBMT_DE, 'YYYYMMDD' ) BETWEEN #searchStartDt# AND      #searchEndDt#)
          <isNotEmpty property="reqOlCdPst" >
 			AND M.req_ol_cd !='2'
 		</isNotEmpty>