From 6529f0fc14e5c32c89c89442755468c37333d3c5 Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Wed, 13 Sep 2023 16:26:59 +0900
Subject: [PATCH] =?UTF-8?q?1.=20=EB=8B=B5=EB=B3=80=EC=A0=84=EC=86=A1=20?=
 =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95=202.=20=EB=AF=BC?=
 =?UTF-8?q?=EC=9B=90=20=EB=93=B1=EB=A1=9D=EC=9D=BC=EC=9E=90=20=EC=A1=B0?=
 =?UTF-8?q?=ED=9A=8C=EC=A1=B0=EA=B1=B4=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/fims/cvlc/crdnCvlcpt-mapper.xml    | 35 +++++++++++++++++--
 .../WEB-INF/jsp/fims/cvlc/cvlc01010-main.jsp  | 28 +++++++++++++++
 .../WEB-INF/jsp/fims/cvlc/cvlc02010-main.jsp  | 28 +++++++++++++++
 .../WEB-INF/jsp/fims/cvlc/cvlc03010-main.jsp  | 28 +++++++++++++++
 4 files changed, 117 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml b/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml
index 4b46c188..b62b3e51 100644
--- a/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml
@@ -177,6 +177,16 @@ WHERE C.DEL_YN = 'N'
 <if test="cvlcptPrcsPicNm != null">
    AND CC.CVLCPT_PRCS_PIC_NM = #{cvlcptPrcsPicNm}
 </if>
+<if test="schDateFrom != null or schDateTo != null">
+	<if test="schDateOpt == 'regDt'">
+		<if test="schDateFrom != null">AND SUBSTR(C.REG_DT,1,8) <![CDATA[ >= ]]> #{schDateFrom} </if>
+		<if test="schDateTo != null">AND SUBSTR(C.REG_DT,1,8) <![CDATA[ <= ]]> #{schDateTo} </if>
+	</if>
+	<if test="schDateOpt == 'mdfcnDt'">
+		<if test="schDateFrom != null">AND SUBSTR(C.MDFCN_DT,1,8) <![CDATA[ >= ]]> #{schDateFrom} </if>
+		<if test="schDateTo != null">AND SUBSTR(C.MDFCN_DT,1,8) <![CDATA[ <= ]]> #{schDateTo} </if>
+	</if>
+</if>
 <if test="by != null and by != '' and term != null">
 	<choose>
 		<when test="mainOption == 'codeValue' or mainOption == 'match' or mainOption == 'ymd'">
@@ -243,6 +253,16 @@ SELECT C.CRDN_ID                                      <!-- 단속 ID -->
 <if test="cvlcptPrcsPicNm != null">
    AND CC.CVLCPT_PRCS_PIC_NM = #{cvlcptPrcsPicNm}
 </if>
+<if test="schDateFrom != null or schDateTo != null">
+	<if test="schDateOpt == 'regDt'">
+		<if test="schDateFrom != null">AND SUBSTR(C.REG_DT,1,8) <![CDATA[ >= ]]> #{schDateFrom} </if>
+		<if test="schDateTo != null">AND SUBSTR(C.REG_DT,1,8) <![CDATA[ <= ]]> #{schDateTo} </if>
+	</if>
+	<if test="schDateOpt == 'mdfcnDt'">
+		<if test="schDateFrom != null">AND SUBSTR(C.MDFCN_DT,1,8) <![CDATA[ >= ]]> #{schDateFrom} </if>
+		<if test="schDateTo != null">AND SUBSTR(C.MDFCN_DT,1,8) <![CDATA[ <= ]]> #{schDateTo} </if>
+	</if>
+</if>
 <if test="by != null and by != '' and term != null">
 	<choose>
 		<when test="mainOption == 'codeValue' or mainOption == 'match' or mainOption == 'ymd'">
@@ -350,7 +370,7 @@ SELECT C.CRDN_ID                <!-- 단속 ID -->
          <if test='editDataExist == "Y"'>
          , DSTRBNC_YN           = NULLIF(#{crdnCvlcpt.dstrbncYn},'N')        /* 방해 여부 */
          </if>
-     WHERE CVLCPT_LINK_ID = #{cvlcptLinkId}                   /* 연계 ID */
+     WHERE CVLCPT_LINK_ID = #{crdnCvlcpt.cvlcptLinkId}                   /* 연계 ID */
 </update>
 
 <update id="updateCvlcptProcessSectionForSendBack" parameterType="cokr.xit.fims.cvlc.CrdnCvlcpt">
@@ -422,6 +442,16 @@ SELECT C.CRDN_ID                                      <!-- 단속 ID -->
 	<if test="schCvlcptRcptYmdTo != null">AND CC.CVLCPT_RCPT_YMD <![CDATA[ <= ]]> #{schCvlcptRcptYmdTo} </if>
 </if>
 <if test="cvlcptPrcsCd != null">AND CC.CVLCPT_PRCS_CD = #{cvlcptPrcsCd}</if>
+<if test="schDateFrom != null or schDateTo != null">
+	<if test="schDateOpt == 'regDt'">
+		<if test="schDateFrom != null">AND SUBSTR(C.REG_DT,1,8) <![CDATA[ >= ]]> #{schDateFrom} </if>
+		<if test="schDateTo != null">AND SUBSTR(C.REG_DT,1,8) <![CDATA[ <= ]]> #{schDateTo} </if>
+	</if>
+	<if test="schDateOpt == 'mdfcnDt'">
+		<if test="schDateFrom != null">AND SUBSTR(C.MDFCN_DT,1,8) <![CDATA[ >= ]]> #{schDateFrom} </if>
+		<if test="schDateTo != null">AND SUBSTR(C.MDFCN_DT,1,8) <![CDATA[ <= ]]> #{schDateTo} </if>
+	</if>
+</if>
 <if test="by != null and by != '' and term != null">
 	<choose>
 		<when test="mainOption == 'codeValue' or mainOption == 'match' or mainOption == 'ymd'">
@@ -525,7 +555,8 @@ SELECT CC.CVLCPT_LINK_ID                    /* 민원 연계 ID */
           FROM TB_DEPT_INFO DI
          WHERE DI.DEPT_CD = U.DEPT_CD
            AND DI.SGG_CD = SI.SGG_CD
-           AND ROWNUM = 1
+           AND DI.USE_YN = 'Y'
+         LIMIT 1
      ) AS CVLCPT_PRCS_DEPT_NM               /* 민원 처리 부서 명 */
      , U.NSTT_CD AS CVLCPT_PRCS_NSTT_CD     /* 민원 처리 기관 코드 */
      , EI.PETI_ANC_CODE_V                   /* 민원 기관코드 */
diff --git a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01010-main.jsp
index 9e05ccb3..bc62b24c 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01010-main.jsp
@@ -52,9 +52,37 @@
 									<input type="hidden" id="mainOption--${pageName}" name="mainOption" />
 									<input type="hidden" id="subOption--${pageName}" name="subOption" />
 									<input type="text" id="term--${pageName}" name="term" class="form-control" />
+									<span class="flr">
+		                                <button type="button" class="btn btn-open-detail"
+		                                	data-bs-toggle="collapse" data-bs-target="#searchDetail--${pageName}">
+		                                    <i class="bx bx-chevron-down"></i>
+		                                    상세검색
+		                                </button>
+		                            </span>
 		                        </div>
 		                    </div>
 				        </div>
+				        <div id="searchDetail--${pageName}" class="container-search container-search-detail collapse">
+				            <div class="row">
+				            	<div class="col-6">
+		                        	<select id="schDateOpt--${pageName}" name="schDateOpt" class="form-select">
+		                                <option value="regDt">등록일자</option>
+		                                <option value="mdfcnDt">수정일자</option>
+		                            </select>
+		                            <span class="form-search-linebox">
+		                                <input type="text" id="schDateFrom--${pageName}" name="schDateFrom" 
+		                                	class="form-control form-date"
+		                                	data-fmt-type="day"   title="시작 날짜 선택" />
+		                                <button type="button" class="bx bx-sm bx-calendar bg-white"></button>
+		                                ~
+		                                <input type="text" id="schDateTo--${pageName}" name="schDateTo" 
+		                                	class="form-control form-date"
+		                                	data-fmt-type="day" title="종료 날짜 선택">
+		                                <button type="button" class="bx bx-sm bx-calendar bg-white"></button>
+		                            </span>
+		                        </div>
+				            </div>
+				        </div>
 				    </form>
 
 				    <div>
diff --git a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc02010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc02010-main.jsp
index cbfd339c..c4dcde00 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc02010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc02010-main.jsp
@@ -59,9 +59,37 @@
 									<input type="hidden" id="mainOption--${pageName}" name="mainOption" />
 									<input type="hidden" id="subOption--${pageName}" name="subOption" />
 									<input type="text" id="term--${pageName}" name="term" class="form-control" />
+									<span class="flr">
+		                                <button type="button" class="btn btn-open-detail"
+		                                	data-bs-toggle="collapse" data-bs-target="#searchDetail--${pageName}">
+		                                    <i class="bx bx-chevron-down"></i>
+		                                    상세검색
+		                                </button>
+		                            </span>
 		                        </div>
 		                    </div>
 				        </div>
+				        <div id="searchDetail--${pageName}" class="container-search container-search-detail collapse">
+				            <div class="row">
+				            	<div class="col-6">
+		                        	<select id="schDateOpt--${pageName}" name="schDateOpt" class="form-select">
+		                                <option value="regDt">등록일자</option>
+		                                <option value="mdfcnDt">수정일자</option>
+		                            </select>
+		                            <span class="form-search-linebox">
+		                                <input type="text" id="schDateFrom--${pageName}" name="schDateFrom" 
+		                                	class="form-control form-date"
+		                                	data-fmt-type="day"   title="시작 날짜 선택" />
+		                                <button type="button" class="bx bx-sm bx-calendar bg-white"></button>
+		                                ~
+		                                <input type="text" id="schDateTo--${pageName}" name="schDateTo" 
+		                                	class="form-control form-date"
+		                                	data-fmt-type="day" title="종료 날짜 선택">
+		                                <button type="button" class="bx bx-sm bx-calendar bg-white"></button>
+		                            </span>
+		                        </div>
+				            </div>
+				        </div>
 				    </form>
 
 					<div class="text-red">
diff --git a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc03010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc03010-main.jsp
index 16414bf3..ad5bf5ab 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc03010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc03010-main.jsp
@@ -52,9 +52,37 @@
 									<input type="hidden" id="mainOption--${pageName}" name="mainOption" />
 									<input type="hidden" id="subOption--${pageName}" name="subOption" />
 									<input type="text" id="term--${pageName}" name="term" class="form-control" />
+									<span class="flr">
+		                                <button type="button" class="btn btn-open-detail"
+		                                	data-bs-toggle="collapse" data-bs-target="#searchDetail--${pageName}">
+		                                    <i class="bx bx-chevron-down"></i>
+		                                    상세검색
+		                                </button>
+		                            </span>
 		                        </div>
 		                    </div>
 				        </div>
+				        <div id="searchDetail--${pageName}" class="container-search container-search-detail collapse">
+				            <div class="row">
+				            	<div class="col-6">
+		                        	<select id="schDateOpt--${pageName}" name="schDateOpt" class="form-select">
+		                                <option value="regDt">등록일자</option>
+		                                <option value="mdfcnDt">수정일자</option>
+		                            </select>
+		                            <span class="form-search-linebox">
+		                                <input type="text" id="schDateFrom--${pageName}" name="schDateFrom" 
+		                                	class="form-control form-date"
+		                                	data-fmt-type="day"   title="시작 날짜 선택" />
+		                                <button type="button" class="bx bx-sm bx-calendar bg-white"></button>
+		                                ~
+		                                <input type="text" id="schDateTo--${pageName}" name="schDateTo" 
+		                                	class="form-control form-date"
+		                                	data-fmt-type="day" title="종료 날짜 선택">
+		                                <button type="button" class="bx bx-sm bx-calendar bg-white"></button>
+		                            </span>
+		                        </div>
+				            </div>
+				        </div>
 				    </form>
 
 				    <div>