Merge branch 'anjooyoung'

src/main/resources/egovframework/sqlmap/kccadr/adjcclt/AdjustConciliator_SQL_Mysql.xml

@@ -207,10 +207,7 @@
 		)
 		<isNotEmpty property="searchKeyword">
 			<isEqual prepend="AND" property="searchCondition" compareValue="1">
-				RS.ADR_SEQ LIKE CONCAT('%' , #searchKeyword#, '%')
-			</isEqual>
-			<isEqual prepend="AND" property="searchCondition" compareValue="2">
-				TO_CHAR(RS.SBMT_DE,'YYYY-MM-DD') = #searchKeyword#
+				RS.ADR_NO LIKE CONCAT('%' , #searchKeyword#, '%')
 			</isEqual>
 			<isEqual prepend="AND" property="searchCondition" compareValue="3">
 				RS.APPLI_CANT_NM LIKE CONCAT('%' , #searchKeyword#, '%')
@@ -229,15 +226,15 @@
 		<isNotEmpty prepend="AND" property="searchStatus">
 			RS.STAT_CD = #searchStatus#
 		</isNotEmpty>
-
-		<isNotEmpty prepend="AND" property="searchStartDt">
-			TO_CHAR(RS.FRST_REGIST_PNTTM,'YYYYMMDD') <![CDATA[ >= ]]> REPLACE(#searchStartDt#, '-' , '')
-		</isNotEmpty>
-
-		<isNotEmpty prepend="AND" property="searchEndDt">
-			TO_CHAR(RS.FRST_REGIST_PNTTM,'YYYYMMDD')<![CDATA[ <= ]]> REPLACE(#searchEndDt#, '-' , '')
-		</isNotEmpty>
-
+		<isEqual property="searchCondition" compareValue="2">
+			<isNotEmpty prepend="AND" property="searchStartDt">
+				TO_CHAR(RS.SBMT_DE,'YYYYMMDD') <![CDATA[ >= ]]> REPLACE(#searchStartDt#, '-' , '')
+			</isNotEmpty>
+	
+			<isNotEmpty prepend="AND" property="searchEndDt">
+				TO_CHAR(RS.SBMT_DE,'YYYYMMDD')<![CDATA[ <= ]]> REPLACE(#searchEndDt#, '-' , '')
+			</isNotEmpty>
+		</isEqual>
 		ORDER BY 1=1
 		<isNotEmpty property="searchSortCnd">
 			,$searchSortCnd$

src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/comment/adjstRecommendationCommentList.jsp

@@ -158,7 +158,7 @@
         </c:forEach>
         <c:if test="${fn:length(list) eq 0}">
             <tr>
-                <td colspan="3">
+                <td colspan="4">
                     <p>조회된 의견이 없습니다.</p>
                 </td>
             </tr>

src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/tab/adjstConciliatorTabDocs.jsp

@@ -150,7 +150,7 @@
 <div class="btn_wrap btn_layout03">
     <div class="btn_left">
         <button type="button" class="btnType01" onclick="fnc_view_step_1_popup(); return false;">문서보기</button>
-        <button type="button" class="btnType01" onclick="fnc_view_download_step_1(); return false;">선택다운로드</button>
+        <!-- <button type="button" class="btnType01" onclick="fnc_view_download_step_1(); return false;">선택다운로드</button> -->
     </div>
     <div class="btn_right">
         <button type="button" class="btnType11 btn_list" onclick="fncGoList(); return false;">목록</button>

src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/tab/adjstConciliatorTabInfo.jsp

@@ -233,7 +233,7 @@
 <c:forEach var="list" items="${resPerson}" varStatus="status">
     <div class="tb_wrap">
         <div class="tb_top">
-            <p>피신청인 정보</p>
+            <p>피신청인 정보<c:out value="${status.index+1}" /></p>
         </div>
         <table class="tbType01">
             <caption>피신청인 정보 : 피신청인 분류, 피신청인 이름, 주소, 이메일, 연락처등의 정보제공</caption>