주소 검색 수정(검색조건,검색결과)

WebContent/ui/cfs/common/CP_ADDRESS_01.xml

@@ -118,11 +118,17 @@
 
 		if (data.address == '') {
 			com.alert('주소를 선택하세요');
-		} else if (data.addressDetail == '') {
-			com.alert('상세주소를 입력하세요', function(){ ipt_choice_addressDetail.focus(); });
-		} else {
-			com.closePopup(scwin.callbackFunc, data);
+			return;
 		}
+		
+		if (data.addressDetail == '') {
+			if(!confirm('상세주소가 입력되지 않았습니다. 적용하시겠습니까?')){
+				ipt_choice_addressDetail.focus();
+				return;
+			}
+		}
+		
+		com.closePopup(scwin.callbackFunc, data);
 	};
 	
 
@@ -268,7 +274,7 @@
     						
     						<xf:group class="w2tb_td" style="" tagname="td">
     							<xf:input adjustMaxLength="false" id="inp_keywd" style="width: 140px;" ref="data:paramMap.adrressNm"
-    								ev:onkeydown="scwin.cond_workerNm_onkeydown" ev:onkeyup="scwin.inp_keywd_onkeyup">
+    								ev:onkeyup="scwin.inp_keywd_onkeyup">
     							</xf:input>
     						</xf:group>
     						

src/main/java/cfs/common/dao/mapper/CfsCommon_mapper.xml

@@ -109,33 +109,52 @@
 	 * 공통팝업 > 우편번호 조회 팝업의 주소 목록을 조회한다.
 	 -->
 	<select id="findAddressInfoList" parameterType="cfs.common.vo.RfidInfoVO" resultType="cfs.common.vo.RfidInfoVO">
-		    SELECT ZIP as POSTNO <!-- 우편번호 -->
-                 , (
-                    CTPRVN_NM || ' ' || SIGNGU_NM || ' ' || LWCR_EMD_NM || ' ' || RN || ' ' 
-                    || BULD_MNNM 
-                    || (CASE WHEN BULD_SLNO > 0 THEN '-' || BULD_SLNO END)
-                   ) AS ADDR1 <!-- 주소1 - 메인 -->
-                 , (
-                    '(' || (CASE WHEN LWCR_LI_NM IS NOT NULL THEN LWCR_LI_NM ELSE ADSTRD_NM END) 
-                        || (CASE WHEN SIGNGU_USE_BULD_NM IS NOT NULL THEN ',' || SIGNGU_USE_BULD_NM END) 
-                        || ')' 
-                   ) AS ADDR2 <!-- 주소2 - 상세 -->
-                 , (
-                    '(' || ADSTRD_NM || ' ' 
-                        || (CASE WHEN LWCR_LI_NM IS NOT NULL THEN ' ' || LWCR_LI_NM END) 
-                        || (CASE WHEN MNTN_AT = '1' THEN '산 ' END) 
-                        || LNM_MNNM || (CASE WHEN LNM_SLNO > 0 THEN '-' || LNM_SLNO END) || ')' 
-                   ) AS ADDR3 <!-- 지번주소 -->
-	 	      FROM TB_CFS_ADRES_BULD_INFO
-	 	     WHERE CTPRVN_NM   = #{sido}
-	 	       AND SIGNGU_NM   = #{sigungu}
-               AND (LWCR_EMD_NM         LIKE '%' || #{adrressNm} || '%'
-                OR  RN                  LIKE '%' || #{adrressNm} || '%' 
-                OR  SIGNGU_USE_BULD_NM  LIKE '%' || #{adrressNm} || '%'
-                OR  ADSTRD_NM           LIKE '%' || #{adrressNm} || '%'
-                OR  LWCR_LI_NM          LIKE '%' || #{adrressNm} || '%'
-	 	           )
-	 	     ORDER BY ADDR1
+    SELECT ZIP as POSTNO <!-- 우편번호 -->
+         , (CTPRVN_NM 
+            || NVL2(SIGNGU_NM,' '||SIGNGU_NM,'')
+            || (CASE WHEN SUBSTR(LWCR_EMD_NM, -1) NOT IN (NULL,'동','가','로') THEN (' ' || LWCR_EMD_NM) END)
+            || ' ' || RN 
+            || ' ' || DECODE(UNDGRND_AT,'1','지하','2','공중','3','수상','')
+            || BULD_MNNM 
+            || (CASE WHEN BULD_SLNO > 0 THEN ('-' || BULD_SLNO) END)
+           ) AS ADDR1 <!-- 주소1 - 도로명 기본주소 -->
+         , (
+            (CASE WHEN SUBSTR(LWCR_EMD_NM, -1) IN ('동','가','로') OR BILD_REGSTR_BULD_NM IS NOT NULL THEN '(' END) 
+            || (CASE WHEN SUBSTR(LWCR_EMD_NM, -1) IN ('동','가','로') THEN LWCR_EMD_NM END)
+            || (CASE WHEN SUBSTR(LWCR_EMD_NM, -1) IN ('동','가','로') AND BILD_REGSTR_BULD_NM IS NOT NULL THEN ', ' END) 
+            || BILD_REGSTR_BULD_NM
+            || (CASE WHEN SUBSTR(LWCR_EMD_NM, -1) IN ('동','가','로') OR BILD_REGSTR_BULD_NM IS NOT NULL THEN ') ' END)
+           ) AS ADDR2 <!-- 주소2 - 상세주소 -->
+         , (
+            (CASE WHEN LWCR_EMD_NM IS NULL 
+                  THEN LWCR_LI_NM 
+                  WHEN SUBSTR(LWCR_EMD_NM, -1) IN ('동','가','로')
+                  THEN LWCR_EMD_NM 
+                  ELSE (LWCR_EMD_NM || ' ' || LWCR_LI_NM) END)
+            || ' ' || DECODE(MNTN_AT,'1','산','') 
+            || LNM_MNNM 
+            || (CASE WHEN LNM_SLNO > 0 THEN ('-' || LNM_SLNO) END) 
+            || NVL2(SIGNGU_USE_BULD_NM,' '||SIGNGU_USE_BULD_NM,'')
+            || ' ' || '(' || ADSTRD_NM || ')'
+           ) AS ADDR3 <!-- 지번주소,행정동 -->
+      FROM TB_CFS_ADRES_BULD_INFO
+     WHERE CTPRVN_NM   = #{sido}
+     <choose>
+         <when test='sigungu != null and sigungu != ""'>
+       AND SIGNGU_NM   = #{sigungu}
+         </when>
+         <otherwise>
+       AND SIGNGU_NM IS NULL
+         </otherwise>
+     </choose>
+       AND (RN                     LIKE '%' || #{adrressNm} || '%'
+            OR LWCR_EMD_NM         LIKE '%' || #{adrressNm} || '%'
+            OR LWCR_LI_NM          LIKE '%' || #{adrressNm} || '%'
+            OR BILD_REGSTR_BULD_NM LIKE '%' || #{adrressNm} || '%'
+            OR SIGNGU_USE_BULD_NM  LIKE '%' || #{adrressNm} || '%'
+            OR ADSTRD_NM           LIKE '%' || #{adrressNm} || '%'
+           )
+     ORDER BY ADDR1
 	</select>
 	<select id="findCommonSecure" parameterType="cfs.common.vo.CommonStreamVO" resultType="java.util.Map">
 		 SELECT SERVER_FULL_NAME