From 2a84101c8e602cc9f18a0c6484190892cd6a85d4 Mon Sep 17 00:00:00 2001
From: JooYoung <JooYoung@LAPTOP-LLIKBU6C>
Date: Fri, 28 Oct 2022 11:06:58 +0900
Subject: [PATCH] =?UTF-8?q?=EC=A1=B0=EC=A0=95=EC=9C=84=EC=9B=90=20?=
 =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90=20=ED=99=94=EB=A9=B4=20=EA=B2=80?=
 =?UTF-8?q?=EC=83=89=EC=9E=90,=20=EB=B2=84=ED=8A=BC=20=EB=85=B8=EC=B6=9C,?=
 =?UTF-8?q?=20=ED=85=8C=EC=9D=B4=EB=B8=94=20=EB=A0=88=EC=9D=B4=EC=95=84?=
 =?UTF-8?q?=EC=9B=83=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adjcclt/AdjustConciliator_SQL_Mysql.xml   | 23 ++++++++-----------
 .../adjstRecommendationCommentList.jsp        |  2 +-
 .../adjcclt/tab/adjstConciliatorTabDocs.jsp   |  2 +-
 .../adjcclt/tab/adjstConciliatorTabInfo.jsp   |  2 +-
 4 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjcclt/AdjustConciliator_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjcclt/AdjustConciliator_SQL_Mysql.xml
index 5cd4f169..003ea6b1 100644
--- a/src/main/resources/egovframework/sqlmap/kccadr/adjcclt/AdjustConciliator_SQL_Mysql.xml
+++ b/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$
diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/comment/adjstRecommendationCommentList.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/comment/adjstRecommendationCommentList.jsp
index c84b8e84..8e172607 100644
--- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/comment/adjstRecommendationCommentList.jsp
+++ b/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>
diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/tab/adjstConciliatorTabDocs.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/tab/adjstConciliatorTabDocs.jsp
index 2e010df9..c8da0829 100644
--- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/tab/adjstConciliatorTabDocs.jsp
+++ b/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>
diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/tab/adjstConciliatorTabInfo.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/tab/adjstConciliatorTabInfo.jsp
index fe8171aa..6bb35523 100644
--- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/tab/adjstConciliatorTabInfo.jsp
+++ b/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>