From 9d27581bb1f3340a060f7eafa267b3b37b1003ea Mon Sep 17 00:00:00 2001
From: jjh <jaehyun81@xit.co.kr>
Date: Fri, 21 Jul 2023 16:58:58 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B6=80=EA=B3=BC=EC=A0=9C=EC=99=B8=20?=
 =?UTF-8?q?=EB=8F=99=EC=A0=81=20=EA=B2=80=EC=83=89=20=EC=B6=94=EA=B0=80.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cokr/xit/fims/excl/Excl01Query.java  | 81 ++++++++++++++++---
 .../sql/mapper/fims/excl/excl01-mapper.xml    | 29 ++++++-
 .../WEB-INF/jsp/fims/excl/excl01010-main.jsp  | 37 ++++-----
 3 files changed, 114 insertions(+), 33 deletions(-)

diff --git a/src/main/java/cokr/xit/fims/excl/Excl01Query.java b/src/main/java/cokr/xit/fims/excl/Excl01Query.java
index 4660dba7..b8618f48 100644
--- a/src/main/java/cokr/xit/fims/excl/Excl01Query.java
+++ b/src/main/java/cokr/xit/fims/excl/Excl01Query.java
@@ -16,8 +16,6 @@ public class Excl01Query extends QueryRequest {
 
 	private static final long serialVersionUID = 1L;
 
-	//
-	private String callMethod;
 	// 필수 조건
 	private String sggCd;														// 시군구 코드
 	private String taskSeCd;													// 업무 구분 코드
@@ -39,22 +37,19 @@ public class Excl01Query extends QueryRequest {
 	private String schLevyExclSeCd;												// 부과 제외 구분 코드
 	private String schVhrno;													// 차량번호 - 단속(TB_CRDN)
 	private String schRtpyrNm;													// 납부자 명 - 납부자(TB_PAYER)
+	// 동적 검색 조건
+	private String mainOption;
+	private String subOption;
+	private String grid;
+	private String levyExclSeNm;												// 부과 제외 구분 코드
+	private String vhrno;														// 차량번호 - 단속(TB_CRDN)
+	private String rtpyrNm;														// 납부자 명 - 납부자(TB_PAYER)
 
 	//
 	private String levyExclId;													// 부과 제외 ID
 	private String crdnId;														// 단속 ID
 	private String levyExclSeCd;												// 부과 제외 구분 코드
 
-	public String getCallMethod() {
-		return ifEmpty(callMethod, () -> null);
-	}
-
-	public <T extends Excl01Query> T setCallMethod(String callMethod) {
-		this.callMethod = callMethod;
-
-		return self();
-	}
-
 	public String getSggCd() {
 		return ifEmpty(sggCd, () -> null);
 	}
@@ -235,6 +230,68 @@ public class Excl01Query extends QueryRequest {
 		return self();
 	}
 
+	// 동적 검색 조건
+	public String getMainOption() {
+		return ifEmpty(mainOption, () -> null);
+	}
+
+	public <T extends Excl01Query> T setMainOption(String mainOption) {
+		this.mainOption = mainOption;
+
+		return self();
+	}
+
+	public String getSubOption() {
+		return ifEmpty(subOption, () -> null);
+	}
+
+	public <T extends Excl01Query> T setSubOption(String subOption) {
+		this.subOption = subOption;
+
+		return self();
+	}
+
+	public String getGrid() {
+		return ifEmpty(grid, () -> null);
+	}
+
+	public <T extends Excl01Query> T setGrid(String grid) {
+		this.grid = grid;
+
+		return self();
+	}
+
+	public String getLevyExclSeNm() {
+		return ifEmpty(levyExclSeNm, () -> null);
+	}
+
+	public <T extends Excl01Query> T setLevyExclSeNm(String levyExclSeNm) {
+		this.levyExclSeNm = levyExclSeNm;
+
+		return self();
+	}
+
+	public String getVhrno() {
+		return ifEmpty(vhrno, () -> null);
+	}
+
+	public <T extends Excl01Query> T setVhrno(String vhrno) {
+		this.vhrno = vhrno;
+
+		return self();
+	}
+
+	public String getRtpyrNm() {
+		return ifEmpty(rtpyrNm, () -> null);
+	}
+
+	public <T extends Excl01Query> T setRtpyrNm(String rtpyrNm) {
+		this.rtpyrNm = rtpyrNm;
+
+		return self();
+	}
+
+	//
 	public String getLevyExclId() {
 		return ifEmpty(levyExclId, () -> null);
 	}
diff --git a/src/main/resources/sql/mapper/fims/excl/excl01-mapper.xml b/src/main/resources/sql/mapper/fims/excl/excl01-mapper.xml
index 916591d2..7cbdd29c 100644
--- a/src/main/resources/sql/mapper/fims/excl/excl01-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/excl/excl01-mapper.xml
@@ -71,6 +71,7 @@
              , (SELECT FN_GET_CODE_NM('FIM011', D.RTPYR_SE_CD) FROM DUAL)       AS RTPYR_SE_NM          /* 납부자 구분 명 */
              , D.RTPYR_NO                                                                               /* 납부자 번호 */
              , D.RTPYR_NM                                                                               /* 납부자 명 */
+             , D.RTPYR_BRDT                                                                             /* 납부자 생년월일 */
              , (SELECT FN_GET_BRDT_FORMAT(D.RTPYR_BRDT, '.') FROM DUAL)         AS RTPYR_BRDT_FORMAT    /* 납부자 생년월일 */
              , D.ZIP                                                                                    /* 우편번호 */
              , D.ADDR                                                                                   /* 주소 */
@@ -142,9 +143,6 @@
             <otherwise>
             </otherwise>
         </choose>
-        <if test="by != null and term != null">
-           AND ${by} LIKE CONCAT('%', #{term}, '%')                                                     /* 동적 검색 */
-        </if>
         <choose>
             <when test="schDetailUserOpt == 'rgtr'">
                 <if test="schDetailUserCd != null">
@@ -159,6 +157,31 @@
             <otherwise>
             </otherwise>
         </choose>
+        <if test="by != null and by != '' and term != null">
+            <choose>
+                <when test="mainOption == 'codeValue' or mainOption == 'match' or mainOption == 'ymd'">
+                    <include refid="dynamicSearch.start" />
+                    <choose>
+                        <when test="by == 'levyExclYmd'"> A.LEVY_EXCL_YMD </when>
+                        <when test="by == 'levyExclSeNm'"> A.LEVY_EXCL_SE_CD </when>
+                        <when test="by == 'levyExclRsnNm'"> A.LEVY_EXCL_RSN_CD </when>
+                        <when test="by == 'etcCn'"> A.ETC_CN </when>
+                        <when test="by == 'cvlcptRcptNo'"> E.CVLCPT_RCPT_NO </when>
+                        <when test="by == 'cvlcptRcptYmd'"> E.CVLCPT_RCPT_YMD </when>
+                        <when test="by == 'crdnYmd'"> C.CRDN_YMD </when>
+                        <when test="by == 'vhrno'"> C.VHRNO </when>
+                        <when test="by == 'crdnPlc'"> C.CRDN_PLC </when>
+                        <when test="by == 'crdnSttsNm'"> C.CRDN_STTS_CD </when>
+                        <when test="by == 'rtpyrNm'"> D.RTPYR_NM </when>
+                        <when test="by == 'rtpyrNo'"> D.RTPYR_NO </when>
+                        <when test="by == 'rtpyrBrdt'"> D.RTPYR_BRDT </when>
+                    </choose>
+                    <include refid="dynamicSearch.center" />#{term}<include refid="dynamicSearch.end" />
+                </when>
+                <otherwise>
+                </otherwise>
+            </choose>
+        </if>
         <include refid="utility.orderBy" />
         <include refid="utility.paging-suffix" />
 	</select>
diff --git a/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp
index e7827f72..bee9c60c 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp
@@ -5,7 +5,6 @@
 <div class="content-wrapper">
 	<!-- Content -->
 	<div class="container-xxl flex-grow-1 px-0">
-		<%--h4 id="pageTitle" class="fw-bold py-3 mb-4">페이지 제목</h4--%>
 		<c:set var="prefixName" scope="request">부과제외</c:set>
 
 		<!-- Page Body -->
@@ -71,7 +70,7 @@
 									<label class="form-label fw-bold form-search-title">부과제외구분</label>
 								</div>
 								<div class="col-5">
-	                            <select class="form-select" id="schLevyExclSeCd--${pageName}" name="schLevyExclSeCd">
+	                            <select class="form-select w-px-100" id="schLevyExclSeCd--${pageName}" name="schLevyExclSeCd">
 		                            	<option value="">전체</option>
 		                            	<c:forEach items="${FIM021List}" var="item">
 		                            		<option value="${item.code}">${item.value}</option>
@@ -83,14 +82,14 @@
 									<label class="form-label fw-bold form-search-title">차량번호</label>
 								</div>
 								<div class="col-5">
-									<input type="text" class="form-control" id="schVhrno--${pageName}" name="schVhrno" />
+									<input type="text" class="form-control w-px-150" id="schVhrno--${pageName}" name="schVhrno" />
 								</div>
 								<!-- 납부자명 -->
 								<div class="col-1 text-end">
 									<label class="form-label fw-bold form-search-title">납부자명</label>
 								</div>
 								<div class="col-5">
-									<input type="text" class="form-control" id="schRtpyrNm--${pageName}" name="schRtpyrNm" />
+									<input type="text" class="form-control w-px-150" id="schRtpyrNm--${pageName}" name="schRtpyrNm" />
 								</div>
 								<!-- 등록일자 -->
 								<div class="col-1 text-end">
@@ -116,6 +115,8 @@
 									<input type="text" class="form-control w-100 text-end" id="byOutput--${pageName}" value="동적 검색" readonly />
 								</div>
 								<div class="col-3">
+									<input type="hidden" id="mainOption--${pageName}" name="mainOption" />
+									<input type="hidden" id="subOption--${pageName}" name="subOption" />
 									<input type="text" class="form-control" id="term--${pageName}" name="term" />
 								</div>
 								<div class="col-2">
@@ -185,23 +186,23 @@
 								<table class="datatables-ajax table table-bordered dataTable no-footer"
 									id="DataTables_Table_0--${pageName}" aria-describedby="DataTables_Table_0_info">
 									<thead>
-										<tr>
+										<tr id="theadTr--${pageName}" data-by="by--${pageName}" data-by-output="byOutput--${pageName}" data-main-option="mainOption--${pageName}" data-sub-option="subOption--${pageName}">
 											<th class="sorting" style="width: 24px;">NO.</th>
 											<th class="sorting" style="width: 24px;">
 												<input type="checkbox" class="form-check-input" onchange="${pageName}Control.select(this.checked);">
 											</th>
-											<th>부과제외일자</th>
-											<th>부과제외구분명</th>
-											<th>부과제외사유</th>
-											<th>기타내용</th>
-											<th>민원접수번호</th>
-											<th>민원접수일자</th>
-											<th>단속일시</th>
-											<th>차량번호</th>
-											<th>단속장소</th>
-											<th>처리상태명</th>
-											<th>납부자명</th>
-											<th class="privacy-mask">주민번호(마스크)</th>
+											<th onclick="searchFromGridTitle('LEVY_EXCL_YMD', this.innerText, 'ymd', '');">부과제외일자</th>
+											<th onclick="searchFromGridTitle('LEVY_EXCL_SE_NM', this.innerText, 'codeValue', 'FIM021');">부과제외구분명</th>
+											<th onclick="searchFromGridTitle('LEVY_EXCL_RSN_NM', this.innerText, 'codeValue', 'FIM022');">부과제외사유</th>
+											<th onclick="searchFromGridTitle('ETC_CN', this.innerText, 'match', 'part');">기타내용</th>
+											<th onclick="searchFromGridTitle('CVLCPT_RCPT_NO', this.innerText, 'match', 'part');">민원접수번호</th>
+											<th onclick="searchFromGridTitle('CVLCPT_RCPT_YMD', this.innerText, 'ymd', '');">민원접수일자</th>
+											<th onclick="searchFromGridTitle('CRDN_YMD', this.innerText, 'ymd', '');">단속일시</th>
+											<th onclick="searchFromGridTitle('VHRNO', this.innerText, 'match', 'part');">차량번호</th>
+											<th onclick="searchFromGridTitle('CRDN_PLC', this.innerText, 'match', 'part');">단속장소</th>
+											<th onclick="searchFromGridTitle('CRDN_STTS_NM', this.innerText, 'codeValue', 'FIM010');">처리상태명</th>
+											<th onclick="searchFromGridTitle('RTPYR_NM', this.innerText, 'match', 'part');">납부자명</th>
+											<th onclick="searchFromGridTitle('RTPYR_BRDT', this.innerText, 'match', 'part');">납부자생년월일</th>
 											<th>등록일시</th>
 											<th>등록사용자</th>
 											<th>수정일시</th>
@@ -227,7 +228,7 @@
 											<td class="text-start"  onclick="{onclick}" ondblclick="{ondblclick}">{CRDN_PLC}</td>
 											<td class="text-center" onclick="{onclick}" ondblclick="{ondblclick}">{CRDN_STTS_NM}</td>
 											<td class="text-start"  onclick="{onclick}" ondblclick="{ondblclick}">{RTPYR_NM}</td>
-											<td class="text-center privacy-mask" onclick="{onclick}" ondblclick="{ondblclick}">******-*******</td>
+											<td class="text-center" onclick="{onclick}" ondblclick="{ondblclick}">{RTPYR_BRDT_FORMAT}</td>
 											<td class="text-center" onclick="{onclick}" ondblclick="{ondblclick}">{REG_DT}</td>
 											<td class="text-center" onclick="{onclick}" ondblclick="{ondblclick}">{RGTR}</td>
 											<td class="text-center" onclick="{onclick}" ondblclick="{ondblclick}">{MDFCN_DT}</td>