From 7807c77154ea958fb16d0ba036a177aaaa2885aa Mon Sep 17 00:00:00 2001
From: jjh <jaehyun81@xit.co.kr>
Date: Thu, 3 Aug 2023 12:21:52 +0900
Subject: [PATCH] =?UTF-8?q?jsp=20=ED=99=94=EB=A9=B4=20=EC=88=98=EC=A0=95?=
 =?UTF-8?q?=20=EB=B0=8F=20=EC=BF=BC=EB=A6=AC=20=EC=88=98=EC=A0=95.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cokr/xit/fims/excl/Excl01Query.java  | 50 +++++++++-
 .../java/cokr/xit/fims/excl/Excl02Query.java  | 94 +++++++++++++++++--
 .../java/cokr/xit/fims/excl/Excl03Query.java  | 56 +++++++++++
 .../sql/mapper/fims/excl/excl01-mapper.xml    | 32 +++----
 .../sql/mapper/fims/excl/excl02-mapper.xml    | 56 +++++------
 .../sql/mapper/fims/excl/excl03-mapper.xml    | 32 +++----
 .../WEB-INF/jsp/fims/excl/excl01010-main.jsp  | 86 +++++++++--------
 .../WEB-INF/jsp/fims/excl/excl02010-main.jsp  | 94 ++++++++++---------
 .../WEB-INF/jsp/fims/excl/excl03010-main.jsp  | 58 ++++++------
 9 files changed, 362 insertions(+), 196 deletions(-)

diff --git a/src/main/java/cokr/xit/fims/excl/Excl01Query.java b/src/main/java/cokr/xit/fims/excl/Excl01Query.java
index 04cf37f5..cfbca280 100644
--- a/src/main/java/cokr/xit/fims/excl/Excl01Query.java
+++ b/src/main/java/cokr/xit/fims/excl/Excl01Query.java
@@ -21,7 +21,7 @@ public class Excl01Query extends QueryRequest {
 	private String taskSeCd;													// 업무 구분 코드
 	private String delYn;														// 삭제 여부
 	// ID
-	private String levyExclIDs;													// 부과 제외 ID
+	private String[] levyExclIDs;												// 부과 제외 ID
 	private String levyExclId;													// 부과 제외 ID
 	private String crdnId;														// 단속 ID
 	// 공통 조건
@@ -38,9 +38,13 @@ public class Excl01Query extends QueryRequest {
 	private String schDetailUserNm;												// 상세 검색 사용자 명
 	private String schDetailUserCd;												// 상세 검색 사용자 코드
 	// 검색 조건
+	private String schLevyExclYmdFrom;											// 부과 제외 일자 시작
+	private String schLevyExclYmdTo;											// 부과 제외 일자 종료
 	private String schLevyExclSeCd;												// 부과 제외 구분 코드
 	private String schVhrno;													// 차량번호 - 단속(TB_CRDN)
 	private String schRtpyrNm;													// 납부자 명 - 납부자(TB_PAYER)
+	private String schCrdnYmdFrom;												// 단속 일자 시작
+	private String schCrdnYmdTo;												// 단속 일자 종료
 	// 동적 검색 조건
 	private String mainOption;
 	private String subOption;
@@ -80,11 +84,11 @@ public class Excl01Query extends QueryRequest {
 		return self();
 	}
 
-	public String getLevyExclIDs() {
+	public String[] getLevyExclIDs() {
 		return ifEmpty(levyExclIDs, () -> null);
 	}
 
-	public <T extends Excl01Query> T setLevyExclIDs(String levyExclIDs) {
+	public <T extends Excl01Query> T setLevyExclIDs(String... levyExclIDs) {
 		this.levyExclIDs = levyExclIDs;
 
 		return self();
@@ -230,6 +234,26 @@ public class Excl01Query extends QueryRequest {
 		return self();
 	}
 
+	public String getSchLevyExclYmdFrom() {
+		return ifEmpty(schLevyExclYmdFrom, () -> null);
+	}
+
+	public <T extends Excl01Query> T setSchLevyExclYmdFrom(String schLevyExclYmdFrom) {
+		this.schLevyExclYmdFrom = schLevyExclYmdFrom;
+
+		return self();
+	}
+
+	public String getSchLevyExclYmdTo() {
+		return ifEmpty(schLevyExclYmdTo, () -> null);
+	}
+
+	public <T extends Excl01Query> T setSchLevyExclYmdTo(String schLevyExclYmdTo) {
+		this.schLevyExclYmdTo = schLevyExclYmdTo;
+
+		return self();
+	}
+
 	public String getSchLevyExclSeCd() {
 		return ifEmpty(schLevyExclSeCd, () -> null);
 	}
@@ -260,6 +284,26 @@ public class Excl01Query extends QueryRequest {
 		return self();
 	}
 
+	public String getSchCrdnYmdFrom() {
+		return ifEmpty(schCrdnYmdFrom, () -> null);
+	}
+
+	public <T extends Excl01Query> T setSchCrdnYmdFrom(String schCrdnYmdFrom) {
+		this.schCrdnYmdFrom = schCrdnYmdFrom;
+
+		return self();
+	}
+
+	public String getSchCrdnYmdTo() {
+		return ifEmpty(schCrdnYmdTo, () -> null);
+	}
+
+	public <T extends Excl01Query> T setSchCrdnYmdTo(String schCrdnYmdTo) {
+		this.schCrdnYmdTo = schCrdnYmdTo;
+
+		return self();
+	}
+
 	// 동적 검색 조건 ///////////////////////////////////////////////////////////////
 	public String getMainOption() {
 		return ifEmpty(mainOption, () -> null);
diff --git a/src/main/java/cokr/xit/fims/excl/Excl02Query.java b/src/main/java/cokr/xit/fims/excl/Excl02Query.java
index 22ee2e66..fcad2dda 100644
--- a/src/main/java/cokr/xit/fims/excl/Excl02Query.java
+++ b/src/main/java/cokr/xit/fims/excl/Excl02Query.java
@@ -21,7 +21,7 @@ public class Excl02Query extends QueryRequest {
 	private String taskSeCd;													// 업무 구분 코드
 	private String delYn;														// 삭제 여부
 	// ID
-	private String opnnIDs;														// 의견 제출 ID
+	private String[] opnnIDs;													// 의견 제출 ID
 	private String opnnId;														// 의견 제출 ID
 	private String crdnId;														// 단속 ID
 	// 공통 조건
@@ -38,9 +38,16 @@ public class Excl02Query extends QueryRequest {
 	private String schDetailUserNm;												// 상세 검색 사용자 명
 	private String schDetailUserCd;												// 상세 검색 사용자 코드
 	// 검색 조건
+	private String schRcptYmdFrom;												// 의견제출 접수 일자 시작
+	private String schRcptYmdTo;												// 의견제출 접수 일자 종료
+	private String schAnsYmdFrom;												// 의견제출 답변 일자 시작
+	private String schAnsYmdTo;													// 의견제출 답변 일자 종료
 	private String schOpnnSbmsnSttsCd;											// 의견 제출 상태 코드
-	private String schVhrno;													// 차량번호 - 단속(TB_CRDN)
 	private String schSttrNm;													// 진술자 명
+	private String schVhrno;													// 차량번호 - 단속(TB_CRDN)
+	private String schRtpyrNm;													// 납부자 명 - 납부자(TB_PAYER)
+	private String schCrdnYmdFrom;												// 단속 일자 시작 - 단속(TB_CRDN)
+	private String schCrdnYmdTo;												// 단속 일자 종료 - 단속(TB_CRDN)
 	// 동적 검색 조건
 	private String mainOption;
 	private String subOption;
@@ -75,17 +82,16 @@ public class Excl02Query extends QueryRequest {
 		return self();
 	}
 
-	public String getOpnnIDs() {
+	public String[]  getOpnnIDs() {
 		return ifEmpty(opnnIDs, () -> null);
 	}
 
-	public <T extends Excl02Query> T setOpnnIDs(String opnnIDs) {
+	public <T extends Excl02Query> T setOpnnIDs(String... opnnIDs) {
 		this.opnnIDs = opnnIDs;
 
 		return self();
 	}
 
-
 	public String getOpnnId() {
 		return ifEmpty(opnnId, () -> null);
 	}
@@ -226,6 +232,46 @@ public class Excl02Query extends QueryRequest {
 		return self();
 	}
 
+	public String getSchRcptYmdFrom() {
+		return ifEmpty(schRcptYmdFrom, () -> null);
+	}
+
+	public <T extends Excl02Query> T setSchRcptYmdFrom(String schRcptYmdFrom) {
+		this.schRcptYmdFrom = schRcptYmdFrom;
+
+		return self();
+	}
+
+	public String getSchRcptYmdTo() {
+		return ifEmpty(schRcptYmdTo, () -> null);
+	}
+
+	public <T extends Excl02Query> T setSchRcptYmdTo(String schRcptYmdTo) {
+		this.schRcptYmdTo = schRcptYmdTo;
+
+		return self();
+	}
+
+	public String getSchAnsYmdFrom() {
+		return ifEmpty(schAnsYmdFrom, () -> null);
+	}
+
+	public <T extends Excl02Query> T setSchAnsYmdFrom(String schAnsYmdFrom) {
+		this.schAnsYmdFrom = schAnsYmdFrom;
+
+		return self();
+	}
+
+	public String getSchAnsYmdTo() {
+		return ifEmpty(schAnsYmdTo, () -> null);
+	}
+
+	public <T extends Excl02Query> T setSchAnsYmdTo(String schAnsYmdTo) {
+		this.schAnsYmdTo = schAnsYmdTo;
+
+		return self();
+	}
+
 	public String getSchOpnnSbmsnSttsCd() {
 		return ifEmpty(schOpnnSbmsnSttsCd, () -> null);
 	}
@@ -236,6 +282,16 @@ public class Excl02Query extends QueryRequest {
 		return self();
 	}
 
+	public String getSchSttrNm() {
+		return ifEmpty(schSttrNm, () -> null);
+	}
+
+	public <T extends Excl02Query> T setSchSttrNm(String schSttrNm) {
+		this.schSttrNm = schSttrNm;
+
+		return self();
+	}
+
 	public String getSchVhrno() {
 		return ifEmpty(schVhrno, () -> null);
 	}
@@ -246,12 +302,32 @@ public class Excl02Query extends QueryRequest {
 		return self();
 	}
 
-	public String getSchSttrNm() {
-		return ifEmpty(schSttrNm, () -> null);
+	public String getSchRtpyrNm() {
+		return ifEmpty(schRtpyrNm, () -> null);
 	}
 
-	public <T extends Excl02Query> T setSchSttrNm(String schSttrNm) {
-		this.schSttrNm = schSttrNm;
+	public <T extends Excl02Query> T setSchRtpyrNm(String schRtpyrNm) {
+		this.schRtpyrNm = schRtpyrNm;
+
+		return self();
+	}
+
+	public String getSchCrdnYmdFrom() {
+		return ifEmpty(schCrdnYmdFrom, () -> null);
+	}
+
+	public <T extends Excl02Query> T setSchCrdnYmdFrom(String schCrdnYmdFrom) {
+		this.schCrdnYmdFrom = schCrdnYmdFrom;
+
+		return self();
+	}
+
+	public String getSchCrdnYmdTo() {
+		return ifEmpty(schCrdnYmdTo, () -> null);
+	}
+
+	public <T extends Excl02Query> T setSchCrdnYmdTo(String schCrdnYmdTo) {
+		this.schCrdnYmdTo = schCrdnYmdTo;
 
 		return self();
 	}
diff --git a/src/main/java/cokr/xit/fims/excl/Excl03Query.java b/src/main/java/cokr/xit/fims/excl/Excl03Query.java
index 1d006281..93b2acbb 100644
--- a/src/main/java/cokr/xit/fims/excl/Excl03Query.java
+++ b/src/main/java/cokr/xit/fims/excl/Excl03Query.java
@@ -21,6 +21,7 @@ public class Excl03Query extends QueryRequest {
 	private String taskSeCd;													// 업무 구분 코드
 	private String delYn;														// 삭제 여부
 	// ID
+	private String[] reRegIDs;													// 재등록 ID
 	private String reRegId;														// 재등록 ID
 	private String crdnId;														// 단속 ID
 
@@ -32,7 +33,11 @@ public class Excl03Query extends QueryRequest {
 	private String schDetailUserNm;												// 상세 검색 사용자 명
 	private String schDetailUserCd;												// 상세 검색 사용자 코드
 	// 검색 조건
+	private String schReRegYmdFrom;												// 재등록 일자 시작
+	private String schReRegYmdTo;												// 재등록 일자 종료
 	private String schVhrno;													// 차량번호 - 단속(TB_CRDN)
+	private String schCrdnYmdFrom;												// 단속 일자 시작 - 단속(TB_CRDN)
+	private String schCrdnYmdTo;												// 단속 일자 종료 - 단속(TB_CRDN)
 	// 동적 검색 조건
 	private String mainOption;
 	private String subOption;
@@ -66,6 +71,17 @@ public class Excl03Query extends QueryRequest {
 
 		return self();
 	}
+
+	public String[] getReRegIDs() {
+		return ifEmpty(reRegIDs, () -> null);
+	}
+
+	public <T extends Excl03Query> T setReRegIDs(String... reRegIDs) {
+		this.reRegIDs = reRegIDs;
+
+		return self();
+	}
+
 	public String getReRegId() {
 		return ifEmpty(reRegId, () -> null);
 	}
@@ -146,6 +162,26 @@ public class Excl03Query extends QueryRequest {
 		return self();
 	}
 
+	public String getSchReRegYmdFrom() {
+		return ifEmpty(schReRegYmdFrom, () -> null);
+	}
+
+	public <T extends Excl03Query> T setSchReRegYmdFrom(String schReRegYmdFrom) {
+		this.schReRegYmdFrom = schReRegYmdFrom;
+
+		return self();
+	}
+
+	public String getSchReRegYmdTo() {
+		return ifEmpty(schReRegYmdTo, () -> null);
+	}
+
+	public <T extends Excl03Query> T setSchReRegYmdTo(String schReRegYmdTo) {
+		this.schReRegYmdTo = schReRegYmdTo;
+
+		return self();
+	}
+
 	public String getSchVhrno() {
 		return ifEmpty(schVhrno, () -> null);
 	}
@@ -156,6 +192,26 @@ public class Excl03Query extends QueryRequest {
 		return self();
 	}
 
+	public String getSchCrdnYmdFrom() {
+		return ifEmpty(schCrdnYmdFrom, () -> null);
+	}
+
+	public <T extends Excl03Query> T setSchCrdnYmdFrom(String schCrdnYmdFrom) {
+		this.schCrdnYmdFrom = schCrdnYmdFrom;
+
+		return self();
+	}
+
+	public String getSchCrdnYmdTo() {
+		return ifEmpty(schCrdnYmdTo, () -> null);
+	}
+
+	public <T extends Excl03Query> T setSchCrdnYmdTo(String schCrdnYmdTo) {
+		this.schCrdnYmdTo = schCrdnYmdTo;
+
+		return self();
+	}
+
 	// 동적 검색 조건 ///////////////////////////////////////////////////////////////
 	public String getMainOption() {
 		return ifEmpty(mainOption, () -> 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 4282fbac..1749597d 100644
--- a/src/main/resources/sql/mapper/fims/excl/excl01-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/excl/excl01-mapper.xml
@@ -94,26 +94,18 @@
          WHERE A.DEL_YN                 =  'N'                                                                  /* 삭제 여부 */
            AND C.SGG_CD                 =  #{sggCd}                                                             /* 시군구 코드 */
            AND C.TASK_SE_CD             =  #{taskSeCd}                                                          /* 업무 구분 코드 */
-        <choose>
-            <when test="schDateOpt == 'levyExclYmd'">
-                <if test="schDateFrom != null">
-           AND A.LEVY_EXCL_YMD <![CDATA[ >= ]]> #{schDateFrom}                                                  /* 부과제외 일자 시작 */
-                </if>
-                <if test="schDateTo != null">
-           AND A.LEVY_EXCL_YMD <![CDATA[ <= ]]> #{schDateTo}                                                    /* 부과제외 일자 종료 */
-                </if>
-            </when>
-            <when test="schDateOpt == 'crdnYmd'">
-                <if test="schDateFrom != null">
-           AND C.CRDN_YMD <![CDATA[ >= ]]> #{schDateFrom}                                                       /* 단속 일자 시작 */
-                </if>
-                <if test="schDateTo != null">
-           AND C.CRDN_YMD <![CDATA[ <= ]]> #{schDateTo}                                                         /* 단속 일자 종료 */
-                </if>
-            </when>
-            <otherwise>
-            </otherwise>
-        </choose>
+        <if test="schLevyExclYmdFrom != null">
+           AND A.LEVY_EXCL_YMD <![CDATA[ >= ]]> #{schLevyExclYmdFrom}                                           /* 부과제외 일자 시작 */
+        </if>
+        <if test="schLevyExclYmdTo != null">
+           AND A.LEVY_EXCL_YMD <![CDATA[ <= ]]> #{schLevyExclYmdTo}                                             /* 부과제외 일자 종료 */
+        </if>
+        <if test="schCrdnYmdFrom != null">
+           AND C.CRDN_YMD <![CDATA[ >= ]]> #{schCrdnYmdFrom}                                                    /* 단속 일자 시작 */
+        </if>
+        <if test="schCrdnYmdTo != null">
+           AND C.CRDN_YMD <![CDATA[ <= ]]> #{schCrdnYmdTo}                                                      /* 단속 일자 종료 */
+        </if>
         <if test="schLevyExclSeCd != null">
            AND A.LEVY_EXCL_SE_CD        =  #{schLevyExclSeCd}                                                   /* 부과 제외 구분 코드 */
         </if>
diff --git a/src/main/resources/sql/mapper/fims/excl/excl02-mapper.xml b/src/main/resources/sql/mapper/fims/excl/excl02-mapper.xml
index 96b6f8e0..9e4a8e83 100644
--- a/src/main/resources/sql/mapper/fims/excl/excl02-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/excl/excl02-mapper.xml
@@ -126,45 +126,35 @@
 	<select id="selectOpnnSbmsnList" parameterType="map" resultType="dataobject">/* 의견제출 대장 목록 조회(excl02Mapper.selectOpnnSbmsnList) */
         <include refid="utility.paging-prefix" />
         <include refid="selectList" />
-         WHERE A.DEL_YN                 = 'N'                                   /* 삭제 여부 */
-           AND C.SGG_CD                 = #{sggCd}                              /* 시군구 코드 */
-           AND C.TASK_SE_CD             = #{taskSeCd}                           /* 업무 구분 코드 */
-        <choose>
-            <when test="schDateOpt == 'rcptYmd'">
-                <if test="schDateFrom != null">
-           AND A.RCPT_YMD <![CDATA[ >= ]]> #{schDateFrom}                       /* 접수 일자 시작 */
-                </if>
-                <if test="schDateTo != null">
-           AND A.RCPT_YMD <![CDATA[ <= ]]> #{schDateTo}                         /* 접수 일자 종료 */
-                </if>
-            </when>
-            <when test="schDateOpt == 'ansYmd'">
-                <if test="schDateFrom != null">
-           AND A.ANS_YMD <![CDATA[ >= ]]> #{schDateFrom}                        /* 답변 일자 시작 */
-                </if>
-                <if test="schDateTo != null">
-           AND A.ANS_YMD <![CDATA[ <= ]]> #{schDateTo}                          /* 답변 일자 종료 */
-                </if>
-            </when>
-            <when test="schDateOpt == 'crdnYmd'">
-                <if test="schDateFrom != null">
-           AND C.CRDN_YMD <![CDATA[ >= ]]> #{schDateFrom}                       /* 단속 일자 시작 */
-                </if>
-                <if test="schDateTo != null">
-           AND C.CRDN_YMD <![CDATA[ <= ]]> #{schDateTo}                         /* 단속 일자 종료 */
-                </if>
-            </when>
-            <otherwise>
-            </otherwise>
-        </choose>
+         WHERE A.DEL_YN                 = 'N'                                                                   /* 삭제 여부 */
+           AND C.SGG_CD                 = #{sggCd}                                                              /* 시군구 코드 */
+           AND C.TASK_SE_CD             = #{taskSeCd}                                                           /* 업무 구분 코드 */
+        <if test="schRcptYmdFrom != null">
+           AND A.RCPT_YMD <![CDATA[ >= ]]> #{schRcptYmdFrom}                                                    /* 접수 일자 시작 */
+        </if>
+        <if test="schRcptYmdTo != null">
+           AND A.RCPT_YMD <![CDATA[ <= ]]> #{schRcptYmdTo}                                                      /* 접수 일자 종료 */
+        </if>
+        <if test="schAnsYmdFrom != null">
+           AND A.ANS_YMD <![CDATA[ >= ]]> #{schAnsYmdFrom}                                                      /* 답변 일자 시작 */
+        </if>
+        <if test="schAnsYmdTo != null">
+           AND A.ANS_YMD <![CDATA[ <= ]]> #{schAnsYmdTo}                                                        /* 답변 일자 종료 */
+        </if>
+        <if test="schSttrNm != null">
+           AND A.STTR_NM                = #{schSttrNm}                                                          /* 진술자 명 */
+        </if>
         <if test="schOpnnSbmsnSttsCd != null">
            AND A.OPNN_SBMSN_STTS_CD     = #{schOpnnSbmsnSttsCd}                 /* 의견 제출 상태 코드 */
         </if>
         <if test="schVhrno != null">
            AND C.VHRNO                  = #{schVhrno}                           /* 차량번호 */
         </if>
-        <if test="schSttrNm != null">
-           AND A.STTR_NM                = #{schSttrNm}                          /* 진술자 명 */
+        <if test="schCrdnYmdFrom != null">
+           AND C.CRDN_YMD <![CDATA[ >= ]]> #{schCrdnYmdFrom}                       /* 단속 일자 시작 */
+        </if>
+        <if test="schCrdnYmdTo != null">
+           AND C.CRDN_YMD <![CDATA[ <= ]]> #{schCrdnYmdTo}                         /* 단속 일자 종료 */
         </if>
         <choose>
             <when test="schRegDateOpt == 'regDt'">
diff --git a/src/main/resources/sql/mapper/fims/excl/excl03-mapper.xml b/src/main/resources/sql/mapper/fims/excl/excl03-mapper.xml
index eade5071..0250e10c 100644
--- a/src/main/resources/sql/mapper/fims/excl/excl03-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/excl/excl03-mapper.xml
@@ -68,26 +68,18 @@
            AND A.CRDN_REG_SE_CD         =  '03'                                                                 /* 단속 등록 구분 코드 - FIM026 */
            AND C.SGG_CD                 =  #{sggCd}                                                             /* 시군구 코드 */
            AND C.TASK_SE_CD             =  #{taskSeCd}                                                          /* 업무 구분 코드 */
-        <choose>
-            <when test="schDateOpt == 'reRegYmd'">
-                <if test="schDateFrom != null">
-           AND A.RE_REG_YMD <![CDATA[ >= ]]> #{schDateFrom}                                                     /* 재등록 일자 시작 */
-                </if>
-                <if test="schDateTo != null">
-           AND A.RE_REG_YMD <![CDATA[ <= ]]> #{schDateTo}                                                       /* 재등록 일자 종료 */
-                </if>
-            </when>
-            <when test="schDateOpt == 'crdnYmd'">
-                <if test="schDateFrom != null">
-           AND C.CRDN_YMD <![CDATA[ >= ]]> #{schDateFrom}                                                       /* 재등록 일자 시작 */
-                </if>
-                <if test="schDateTo != null">
-           AND C.CRDN_YMD <![CDATA[ <= ]]> #{schDateTo}                                                         /* 재등록 일자 종료 */
-                </if>
-            </when>
-            <otherwise>
-            </otherwise>
-        </choose>
+        <if test="schReRegYmdFrom != null">
+           AND A.RE_REG_YMD <![CDATA[ >= ]]> #{schReRegYmdFrom}                                                 /* 재등록 일자 시작 */
+        </if>
+        <if test="schReRegYmdTo != null">
+           AND A.RE_REG_YMD <![CDATA[ <= ]]> #{schReRegYmdTo}                                                   /* 재등록 일자 종료 */
+        </if>
+        <if test="schCrdnYmdFrom != null">
+           AND C.CRDN_YMD <![CDATA[ >= ]]> #{schCrdnYmdFrom}                                                    /* 단속 일자 시작 */
+        </if>
+        <if test="schCrdnYmdTo != null">
+           AND C.CRDN_YMD <![CDATA[ <= ]]> #{schCrdnYmdTo}                                                      /* 단속 일자 종료 */
+        </if>
         <if test = "schVhrno != null">
            AND C.VHRNO                  =  #{schVhrno}                                                          /* 차량번호 */
         </if>
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 1351d64f..fee18bed 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
@@ -33,10 +33,8 @@
 						<div class="container-search">
 							<div class="row g-1">
 								<!-- 업무구분 -->
-								<div class="col-1 text-end">
+								<div class="col-12">
 									<label class="form-label fw-bold form-search-title" for="rdoTaskSeCd--${pageName}">업무구분</label>
-								</div>
-								<div class="col-11">
 									<span class="form-search-linebox">
 										<c:forEach items="${FIM054List}" var="item">
 											<label>
@@ -48,29 +46,39 @@
 									</span>
 								</div>
 								<!-- 부과제외일자 -->
-								<div class="col-1 text-end">
-									<select class="form-select text-end" id="schDateOpt--${pageName}" name="schDateOpt">
-										<option value="levyExclYmd">부과제외일자</option>
-										<option value="crdnYmd">단속일자</option>
-									</select>
-								</div>
-								<div class="col-5">
+								<div class="col-6">
+									<label class="form-label fw-bold form-search-title">부과제외일자</label>
 									<span class="form-search-linebox">
-										<input type="text" class="form-control form-date" id="schDateFrom--${pageName}" name="schDateFrom"
+										<input type="text" class="form-control form-date" id="schLevyExclYmdFrom--${pageName}" name="schLevyExclYmdFrom"
 											data-fmt-type="day" title="시작 날짜 선택" />
 										<button type="button" class="bx bx-sm bx-calendar bg-white"></button>
 										~
-										<input type="text" class="form-control form-date" id="schDateTo--${pageName}" name="schDateTo"
+										<input type="text" class="form-control form-date" id="schLevyExclYmdTo--${pageName}" name="schLevyExclYmdTo"
 											data-fmt-type="day" title="종료 날짜 선택" />
 										<button type="button" class="bx bx-sm bx-calendar bg-white"></button>
 									</span>
 								</div>
+<!-- 								<div class="col-1 text-end"> -->
+<%-- 									<select class="form-select text-end" id="schDateOpt--${pageName}" name="schDateOpt"> --%>
+<!-- 										<option value="levyExclYmd">부과제외일자</option> -->
+<!-- 										<option value="crdnYmd">단속일자</option> -->
+<!-- 									</select> -->
+<!-- 								</div> -->
+<!-- 								<div class="col-5"> -->
+<!-- 									<span class="form-search-linebox"> -->
+<%-- 										<input type="text" class="form-control form-date" id="schDateFrom--${pageName}" name="schDateFrom" --%>
+<!-- 											data-fmt-type="day" title="시작 날짜 선택" /> -->
+<!-- 										<button type="button" class="bx bx-sm bx-calendar bg-white"></button> -->
+<!-- 										~ -->
+<%-- 										<input type="text" class="form-control form-date" id="schDateTo--${pageName}" name="schDateTo" --%>
+<!-- 											data-fmt-type="day" title="종료 날짜 선택" /> -->
+<!-- 										<button type="button" class="bx bx-sm bx-calendar bg-white"></button> -->
+<!-- 									</span> -->
+<!-- 								</div> -->
 								<!-- 부과제외구분 -->
-								<div class="col-1 text-end">
+								<div class="col-6">
 									<label class="form-label fw-bold form-search-title">부과제외구분</label>
-								</div>
-								<div class="col-5">
-	                            <select class="form-select w-px-150" id="schLevyExclSeCd--${pageName}" name="schLevyExclSeCd">
+		                            <select class="form-select w-px-150" id="schLevyExclSeCd--${pageName}" name="schLevyExclSeCd">
 		                            	<option value="">전체</option>
 		                            	<c:forEach items="${FIM021List}" var="item">
 		                            		<option value="${item.code}">${item.value}</option>
@@ -78,35 +86,40 @@
 		                            </select>
 								</div>
 								<!-- 차량번호 -->
-								<div class="col-1 text-end">
+								<div class="col-6">
 									<label class="form-label fw-bold form-search-title">차량번호</label>
-								</div>
-								<div class="col-5">
 									<input type="text" class="form-control w-px-150" id="schVhrno--${pageName}" name="schVhrno" />
 								</div>
 								<!-- 납부자명 -->
-								<div class="col-1 text-end">
+								<div class="col-6">
 									<label class="form-label fw-bold form-search-title">납부자명</label>
-								</div>
-								<div class="col-5">
 									<input type="text" class="form-control w-px-150" id="schRtpyrNm--${pageName}" name="schRtpyrNm" />
 								</div>
+								<!-- 단속일자 -->
+								<div class="col-6">
+									<label class="form-label fw-bold form-search-title">단속일자</label>
+									<span class="form-search-linebox">
+										<input type="text" class="form-control form-date" id="schCrdnYmdFrom--${pageName}" name="schCrdnYmdFrom"
+											data-fmt-type="day" title="시작 날짜 선택" />
+										<button type="button" class="bx bx-sm bx-calendar bg-white"></button>
+										~
+										<input type="text" class="form-control form-date" id="schCrdnYmdTo--${pageName}" name="schCrdnYmdTo"
+											data-fmt-type="day" title="종료 날짜 선택" />
+										<button type="button" class="bx bx-sm bx-calendar bg-white"></button>
+									</span>
+								</div>
 								<!-- 동적검색 -->
-								<div class="col-1 text-end">
+								<div class="col-6">
 		                        	<input type="hidden" id="by--${pageName}" name="by" />
-									<input type="text" class="form-control w-px-120 text-end" id="byOutput--${pageName}" value="동적 검색" readonly />
-								</div>
-								<div class="col-9">
+									<input type="text" class="form-control" id="byOutput--${pageName}" value="동적 검색" readonly />
 									<input type="hidden" id="mainOption--${pageName}" name="mainOption" />
 									<input type="hidden" id="subOption--${pageName}" name="subOption" />
-									<input type="text" class="form-control w-px-250" id="term--${pageName}" name="term" />
-								</div>
-								<div class="col-2">
+									<input type="text" class="form-control w-px-300" id="term--${pageName}" name="term" />
 									<!-- 상세 검색조건 버튼 -->
 									<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>
@@ -118,13 +131,11 @@
 						<div id="searchDetail--${pageName}" class="container-search container-search-detail collapse">
 							<div class="row g-1">
 								<!-- 등록일자 -->
-								<div class="col-1 text-end">
+								<div class="col-6">
 									<select class="form-select" id="schRegDateOpt--${pageName}" name="schRegDateOpt">
 										<option value="regDt">등록일자</option>
 										<option value="mdfcnDt">수정일자</option>
 									</select>
-								</div>
-								<div class="col-5">
 									<span class="form-search-linebox">
 										<input type="text" class="form-control form-date" id="schRegDateFrom--${pageName}" name="schRegDateFrom"
 		                                	data-fmt-type="day" title="시작 날짜 선택" />
@@ -136,13 +147,11 @@
 									</span>
 								</div>
 								<!-- 등록자명, 수정자명 -->
-								<div class="col-1 text-end">
+								<div class="col-6">
 									<select class="form-select" id="schDetailUserOpt--${pageName}" name="schDetailUserOpt">
 										<option value="rgtr">등록자명</option>
 										<option value="mdfr">수정자명</option>
 									</select>
-								</div>
-								<div class="col-5">
 									<input type="text" class="form-control" id="schDetailUserNm--${pageName}" name="schDetailUserNm" />
 								</div>
 							</div>
@@ -415,8 +424,9 @@
 	function initForm${pageName}() {
 		// 달력 초기화
 		initDatepicker("frmSearch--${pageName}");
-		$("#schDateFrom--${pageName}").datepicker("setDate", DateUtil.getDateDay(-365).date);
-		$("#schDateTo--${pageName}").datepicker("setDate", new Date());
+
+		$("#schLevyExclYmdFrom--${pageName}").datepicker("setDate", DateUtil.getDateDay(-365).date);
+		$("#schLevyExclYmdTo--${pageName}").datepicker("setDate", new Date());
 
 		${pageName}Control.dataset.clear();
 	}
diff --git a/src/main/webapp/WEB-INF/jsp/fims/excl/excl02010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/excl/excl02010-main.jsp
index 9e683c4f..528e4352 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/excl/excl02010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/excl/excl02010-main.jsp
@@ -33,10 +33,8 @@
 						<div class="container-search">
 							<div class="row g-1">
 								<!-- 업무구분 -->
-								<div class="col-1 text-end">
+								<div class="col-12">
 									<label class="form-label fw-bold form-search-title" for="rdoTaskSeCd--${pageName}">업무구분</label>
-								</div>
-								<div class="col-11">
 									<span class="form-search-linebox">
 										<c:forEach items="${FIM054List}" var="item">
 											<label>
@@ -47,30 +45,35 @@
 										</c:forEach>
 									</span>
 								</div>
-								<!-- 의견제출일자 -->
-								<div class="col-1 text-end">
-									<select class="form-select text-end" id="schDateOpt--${pageName}" name="schDateOpt">
-										<option value="rcptYmd">접수일자</option>
-										<option value="ansYmd">답변일자</option>
-										<option value="crdnYmd">단속일자</option>
-									</select>
+								<!-- 의견제출 접수일자 -->
+								<div class="col-6">
+									<label class="form-label fw-bold form-search-title">접수일자</label>
+									<span class="form-search-linebox">
+										<input type="text" class="form-control form-date" id="schRcptYmdFrom--${pageName}" name="schRcptYmdFrom"
+											data-fmt-type="day" title="시작 날짜 선택" />
+										<button type="button" class="bx bx-sm bx-calendar bg-white"></button>
+										~
+										<input type="text" class="form-control form-date" id="schRcptYmdTo--${pageName}" name="schRcptYmdTo"
+											data-fmt-type="day" title="종료 날짜 선택" />
+										<button type="button" class="bx bx-sm bx-calendar bg-white"></button>
+									</span>
 								</div>
-								<div class="col-5">
+								<!-- 의견제출 답변일자 -->
+								<div class="col-6">
+									<label class="form-label fw-bold form-search-title">답변일자</label>
 									<span class="form-search-linebox">
-										<input type="text" class="form-control form-date" id="schDateFrom--${pageName}" name="schDateFrom"
+										<input type="text" class="form-control form-date" id="schAnsYmdFrom--${pageName}" name="schAnsYmdFrom"
 											data-fmt-type="day" title="시작 날짜 선택" />
 										<button type="button" class="bx bx-sm bx-calendar bg-white"></button>
 										~
-										<input type="text" class="form-control form-date" id="schDateTo--${pageName}" name="schDateTo"
+										<input type="text" class="form-control form-date" id="schAnsYmdTo--${pageName}" name="schAnsYmdTo"
 											data-fmt-type="day" title="종료 날짜 선택" />
 										<button type="button" class="bx bx-sm bx-calendar bg-white"></button>
 									</span>
 								</div>
 								<!-- 의견제출상태 -->
-								<div class="col-1 text-end">
+								<div class="col-6">
 									<label class="form-label fw-bold form-search-title">의견제출상태</label>
-								</div>
-								<div class="col-5">
 		                            <select class="form-select w-px-150" id="schOpnnSbmsnSttsCd--${pageName}" name="schOpnnSbmsnSttsCd">
 		                            	<option value="">전체</option>
 		                            	<c:forEach items="${FIM031List}" var="item">
@@ -79,35 +82,35 @@
 		                            </select>
 								</div>
 								<!-- 차량번호 -->
-								<div class="col-1 text-end">
+								<div class="col-6">
 									<label class="form-label fw-bold form-search-title">차량번호</label>
-								</div>
-								<div class="col-5">
 									<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 w-px-150" id="schSttrNm--${pageName}" name="schSttrNm" />
+								<!-- 단속일자 -->
+								<div class="col-6">
+									<label class="form-label fw-bold form-search-title">단속일자</label>
+									<span class="form-search-linebox">
+										<input type="text" class="form-control form-date" id="schCrdnYmdFrom--${pageName}" name="schCrdnYmdFrom"
+											data-fmt-type="day" title="시작 날짜 선택" />
+										<button type="button" class="bx bx-sm bx-calendar bg-white"></button>
+										~
+										<input type="text" class="form-control form-date" id="schCrdnYmdTo--${pageName}" name="schCrdnYmdTo"
+											data-fmt-type="day" title="종료 날짜 선택" />
+										<button type="button" class="bx bx-sm bx-calendar bg-white"></button>
+									</span>
 								</div>
 								<!-- 동적검색 -->
-								<div class="col-1 text-end">
+								<div class="col-6">
 		                        	<input type="hidden" id="by--${pageName}" name="by" />
-									<input type="text" class="form-control w-px-120 text-end" id="byOutput--${pageName}" value="동적 검색" readonly />
-								</div>
-								<div class="col-9">
+									<input type="text" class="form-control" id="byOutput--${pageName}" value="동적 검색" readonly />
 									<input type="hidden" id="mainOption--${pageName}" name="mainOption" />
 									<input type="hidden" id="subOption--${pageName}" name="subOption" />
-									<input type="text" class="form-control w-px-250" id="term--${pageName}" name="term" />
-								</div>
-								<div class="col-2">
+									<input type="text" class="form-control w-px-300" id="term--${pageName}" name="term" />
 									<!-- 상세 검색조건 버튼 -->
 									<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>
@@ -118,14 +121,22 @@
 						<!-- 상세 조건 -->
 						<div id="searchDetail--${pageName}" class="container-search container-search-detail collapse">
 							<div class="row g-1">
+								<!-- 진술자명 -->
+								<div class="col-6">
+									<label class="form-label fw-bold form-search-title">진술자명</label>
+									<input type="text" class="form-control w-px-150" id="schSttrNm--${pageName}" name="schSttrNm" />
+								</div>
+								<!-- 납부자명 -->
+								<div class="col-6">
+									<label class="form-label fw-bold form-search-title">납부자명</label>
+									<input type="text" class="form-control w-px-150" id="schRtpyrNm--${pageName}" name="schRtpyrNm" />
+								</div>
 								<!-- 등록일자, 수정일자 -->
-								<div class="col-1 text-end">
+								<div class="col-6">
 									<select class="form-select" id="schRegDateOpt--${pageName}" name="schRegDateOpt">
 										<option value="regDt">등록일자</option>
 										<option value="mdfcnDt">수정일자</option>
 									</select>
-								</div>
-								<div class="col-5">
 									<span class="form-search-linebox">
 										<input type="text" class="form-control form-date" id="schRegDateFrom--${pageName}" name="schRegDateFrom"
 		                                	data-fmt-type="day" title="시작 날짜 선택" />
@@ -137,14 +148,12 @@
 									</span>
 								</div>
 								<!-- 등록자명, 수정자명 -->
-								<div class="col-1 text-end">
+								<div class="col-6">
 									<select class="form-select" id="schDetailUserOpt--${pageName}" name="schDetailUserOpt">
 										<option value="rgtr">등록자명</option>
 										<option value="mdfr">수정자명</option>
 									</select>
-								</div>
-								<div class="col-5">
-									<input type="text" class="form-control" id="schDetailUserNm--${pageName}" name="schDetailUserNm" />
+									<input type="text" class="form-control w-px-150" id="schDetailUserNm--${pageName}" name="schDetailUserNm" />
 								</div>
 							</div>
 						</div>
@@ -373,8 +382,9 @@
 	function initForm${pageName}() {
 		// 달력 초기화
 		initDatepicker("frmSearch--${pageName}");
-		$("#schDateFrom--${pageName}").datepicker("setDate", DateUtil.getDateDay(-365).date);
-		$("#schDateTo--${pageName}").datepicker("setDate", new Date());
+
+		$("#schRcptYmdFrom--${pageName}").datepicker("setDate", DateUtil.getDateDay(-365).date);
+		$("#schRcptYmdTo--${pageName}").datepicker("setDate", new Date());
 
 		${pageName}Control.dataset.clear();
 	}
diff --git a/src/main/webapp/WEB-INF/jsp/fims/excl/excl03010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/excl/excl03010-main.jsp
index cdf15d9d..fa12b175 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/excl/excl03010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/excl/excl03010-main.jsp
@@ -34,10 +34,8 @@
 						<div class="container-search">
 							<div class="row g-1">
 								<!-- 업무구분 -->
-								<div class="col-1 text-end">
+								<div class="col-12">
 									<label class="form-label fw-bold form-search-title" for="rdoTaskSeCd--${pageName}">업무구분</label>
-								</div>
-								<div class="col-11">
 									<span class="form-search-linebox">
 										<c:forEach items="${FIM054List}" var="item">
 											<label>
@@ -49,46 +47,48 @@
 									</span>
 								</div>
 								<!-- 재등록일자 -->
-								<div class="col-1 text-end">
-									<select class="form-select text-end" id="schDateOpt--${pageName}" name="schDateOpt">
-										<option value="reRegYmd">재등록일자</option>
-										<option value="crdnYmd">단속일자</option>
-									</select>
-								</div>
-								<div class="col-5">
+								<div class="col-6">
+									<label class="form-label fw-bold form-search-title">재등록일자</label>
 									<span class="form-search-linebox">
-										<input type="text" class="form-control form-date" id="schDateFrom--${pageName}" name="schDateFrom"
+										<input type="text" class="form-control form-date" id="schReRegYmdFrom--${pageName}" name="schReRegYmdFrom"
 											data-fmt-type="day" title="시작 날짜 선택" />
 										<button type="button" class="bx bx-sm bx-calendar bg-white"></button>
 										~
-										<input type="text" class="form-control form-date" id="schDateTo--${pageName}" name="schDateTo"
+										<input type="text" class="form-control form-date" id="schReRegYmdTo--${pageName}" name="schReRegYmdTo"
 											data-fmt-type="day" title="종료 날짜 선택" />
 										<button type="button" class="bx bx-sm bx-calendar bg-white"></button>
 									</span>
 								</div>
 								<!-- 차량번호 -->
-								<div class="col-1 text-end">
+								<div class="col-6">
 									<label class="form-label fw-bold form-search-title">차량번호</label>
-								</div>
-								<div class="col-5">
 									<input type="text" class="form-control w-px-150" id="schVhrno--${pageName}" name="schVhrno" />
 								</div>
+								<!-- 단속일자 -->
+								<div class="col-6">
+									<label class="form-label fw-bold form-search-title">단속일자</label>
+									<span class="form-search-linebox">
+										<input type="text" class="form-control form-date" id="schCrdnYmdFrom--${pageName}" name="schCrdnYmdFrom"
+											data-fmt-type="day" title="시작 날짜 선택" />
+										<button type="button" class="bx bx-sm bx-calendar bg-white"></button>
+										~
+										<input type="text" class="form-control form-date" id="schCrdnYmdTo--${pageName}" name="schCrdnYmdTo"
+											data-fmt-type="day" title="종료 날짜 선택" />
+										<button type="button" class="bx bx-sm bx-calendar bg-white"></button>
+									</span>
+								</div>
 								<!-- 동적검색 -->
-								<div class="col-1 text-end">
+								<div class="col-6">
 		                        	<input type="hidden" id="by--${pageName}" name="by" />
-									<input type="text" class="form-control w-px-120 text-end" id="byOutput--${pageName}" value="동적 검색" readonly />
-								</div>
-								<div class="col-9">
+									<input type="text" class="form-control" id="byOutput--${pageName}" value="동적 검색" readonly />
 									<input type="hidden" id="mainOption--${pageName}" name="mainOption" />
 									<input type="hidden" id="subOption--${pageName}" name="subOption" />
-									<input type="text" class="form-control w-px-250" id="term--${pageName}" name="term" />
-								</div>
-								<div class="col-2">
+									<input type="text" class="form-control w-px-300" id="term--${pageName}" name="term" />
 									<!-- 상세 검색조건 버튼 -->
 									<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>
@@ -100,13 +100,11 @@
 						<div id="searchDetail--${pageName}" class="container-search container-search-detail collapse">
 							<div class="row g-1">
 								<!-- 등록일자, 수정일자 -->
-								<div class="col-1 text-end">
+								<div class="col-6">
 									<select class="form-select" id="schRegDateOpt--${pageName}" name="schRegDateOpt">
 										<option value="regDt">등록일자</option>
 										<option value="mdfcnDt">수정일자</option>
 									</select>
-								</div>
-								<div class="col-5">
 									<span class="form-search-linebox">
 										<input type="text" class="form-control form-date" id="schRegDateFrom--${pageName}" name="schRegDateFrom"
 		                                	data-fmt-type="day" title="시작 날짜 선택" />
@@ -118,13 +116,11 @@
 									</span>
 								</div>
 								<!-- 등록자명, 수정자명 -->
-								<div class="col-1 text-end">
+								<div class="col-6">
 									<select class="form-select" id="schDetailUserOpt--${pageName}" name="schDetailUserOpt">
 										<option value="rgtr">등록자명</option>
 										<option value="mdfr">수정자명</option>
 									</select>
-								</div>
-								<div class="col-5">
 									<input type="text" class="form-control" id="schDetailUserNm--${pageName}" name="schDetailUserNm" />
 								</div>
 							</div>
@@ -346,8 +342,8 @@
 	function initForm${pageName}() {
 		// 달력 초기화
 		initDatepicker("frmSearch--${pageName}");
-		$("#schDateFrom--${pageName}").datepicker("setDate", new Date());
-		$("#schDateTo--${pageName}").datepicker("setDate", new Date());
+		$("#schReRegYmdFrom--${pageName}").datepicker("setDate", new Date());
+		$("#schReRegYmdTo--${pageName}").datepicker("setDate", new Date());
 
 		${pageName}Control.dataset.clear();
 	}