Merge branch 'master' of http://tolag3@vcs.iten.co.kr:9999/hylee/kcc_adr_advc_git

src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cmm/Cmm_SQL_Mysql.xml

@@ -1459,7 +1459,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
@@ -1535,7 +1540,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
@@ -1569,7 +1583,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>