From 99c88c662d725dca89dd38ca6db6000ed2aabe38 Mon Sep 17 00:00:00 2001
From: jjh <jaehyun81@xit.co.kr>
Date: Thu, 14 Dec 2023 18:15:02 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9A=B0=ED=8E=B8=ED=86=B5=ED=95=A9=20-=20?=
 =?UTF-8?q?=EC=A0=91=EC=88=98=EA=B2=B0=EA=B3=BC=20=EC=83=81=EC=84=B8?=
 =?UTF-8?q?=EC=A1=B0=ED=9A=8C=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/cmmn/CmmnQuery.java    | 61 ++++-------------
 .../java/cokr/xit/fims/epst/EpostQuery.java   | 61 +----------------
 .../mapper/fims/epst/epostRcptRslt-mapper.xml | 68 +++++++++----------
 .../WEB-INF/jsp/fims/epst/epst02050-main.jsp  | 16 ++---
 4 files changed, 59 insertions(+), 147 deletions(-)

diff --git a/src/main/java/cokr/xit/fims/cmmn/CmmnQuery.java b/src/main/java/cokr/xit/fims/cmmn/CmmnQuery.java
index bdba2fe7..a62e0cb2 100644
--- a/src/main/java/cokr/xit/fims/cmmn/CmmnQuery.java
+++ b/src/main/java/cokr/xit/fims/cmmn/CmmnQuery.java
@@ -24,13 +24,9 @@ public class CmmnQuery extends QueryRequest {
 	private String schRegDateOpt;		// 등록 일자 구분
 	private String schRegDateFrom;		// 등록 일자 시작
 	private String schRegDateTo;		// 등록 일자 종료
-
-	private String schDetailCrdnRegDtOpt;		// 상세 검색 단속 등록 일자 구분
-	private String schDetailCrdnRegDtFrom;		// 상세 검색 단속 등록 일자 시작
-	private String schDetailCrdnRegDtTo;		// 상세 검색 단속 등록 일자 종료
-	private String schDetailCrdnRgtrOpt;		// 상세 검색 단속 등록 사용자 구분
-	private String schDetailCrdnRgtrNm;			// 상세 검색 단속 등록 사용자 명
-	private String schDetailCrdnRgtrCd;			// 상세 검색 단속 등록 사용자 코드
+	private String schRgtrOpt;			// 등록 사용자 구분
+	private String schRgtrCd;			// 등록 사용자 코드
+	private String schRgtrNm;			// 등록 사용자 명
 
 	public String getMainOption() {
 		return ifEmpty(mainOption, () -> null);
@@ -167,57 +163,30 @@ public class CmmnQuery extends QueryRequest {
 		return self();
 	}
 
-	public String getSchDetailCrdnRegDtOpt() {
-		return ifEmpty(schDetailCrdnRegDtOpt, () -> null);
-	}
-
-	public <T extends CmmnQuery> T setSchDetailCrdnRegDtOpt(String schDetailCrdnRegDtOpt) {
-		this.schDetailCrdnRegDtOpt = schDetailCrdnRegDtOpt;
-		return self();
-	}
-
-	public String getSchDetailCrdnRegDtFrom() {
-		return ifEmpty(schDetailCrdnRegDtFrom, () -> null);
-	}
-
-	public <T extends CmmnQuery> T setSchDetailCrdnRegDtFrom(String schDetailCrdnRegDtFrom) {
-		this.schDetailCrdnRegDtFrom = schDetailCrdnRegDtFrom;
-		return self();
-	}
-
-	public String getSchDetailCrdnRegDtTo() {
-		return ifEmpty(schDetailCrdnRegDtTo, () -> null);
-	}
-
-	public <T extends CmmnQuery> T setSchDetailCrdnRegDtTo(String schDetailCrdnRegDtTo) {
-		this.schDetailCrdnRegDtTo = schDetailCrdnRegDtTo;
-		return self();
-	}
-
-	public String getSchDetailCrdnRgtrOpt() {
-		return ifEmpty(schDetailCrdnRgtrOpt, () -> null);
+	public String getSchRgtrOpt() {
+		return ifEmpty(schRgtrOpt, () -> null);
 	}
 
-	public <T extends CmmnQuery> T setSchDetailCrdnRgtrOpt(String schDetailCrdnRgtrOpt) {
-		this.schDetailCrdnRgtrOpt = schDetailCrdnRgtrOpt;
+	public <T extends CmmnQuery> T setSchRgtrOpt(String schRgtrOpt) {
+		this.schRgtrOpt = schRgtrOpt;
 		return self();
 	}
 
-	public String getSchDetailCrdnRgtrNm() {
-		return ifEmpty(schDetailCrdnRgtrNm, () -> null);
+	public String getSchRgtrCd() {
+		return ifEmpty(schRgtrCd, () -> null);
 	}
 
-	public <T extends CmmnQuery> T setSchDetailCrdnRgtrNm(String schDetailCrdnRgtrNm) {
-		this.schDetailCrdnRgtrNm = schDetailCrdnRgtrNm;
+	public <T extends CmmnQuery> T setSchRgtrCd(String schRgtrCd) {
+		this.schRgtrCd = schRgtrCd;
 		return self();
 	}
 
-	public String getSchDetailCrdnRgtrCd() {
-		return ifEmpty(schDetailCrdnRgtrCd, () -> null);
+	public String getSchRgtrNm() {
+		return ifEmpty(schRgtrNm, () -> null);
 	}
 
-	public <T extends CmmnQuery> T setSchDetailCrdnRgtrCd(String schDetailCrdnRgtrCd) {
-		this.schDetailCrdnRgtrCd = schDetailCrdnRgtrCd;
+	public <T extends CmmnQuery> T setSchRgtrNm(String schRgtrNm) {
+		this.schRgtrNm = schRgtrNm;
 		return self();
 	}
 
diff --git a/src/main/java/cokr/xit/fims/epst/EpostQuery.java b/src/main/java/cokr/xit/fims/epst/EpostQuery.java
index 653e2a5a..62d4a091 100644
--- a/src/main/java/cokr/xit/fims/epst/EpostQuery.java
+++ b/src/main/java/cokr/xit/fims/epst/EpostQuery.java
@@ -47,12 +47,7 @@ public class EpostQuery extends CmmnQuery {
 	private String schExtriRegymdTo;	// 전자우편 접수 결과(TB_EPOST_RCPT_RSLT)_기관발송일자 종료
 	private String schSndngSeCd;		// 발송 구분 코드
 	// 상세 검색 조건
-	private String schDetailRegDtOpt;	// 상세 검색 등록 일자 구분
-	private String schDetailRegDtFrom;	// 상세 검색 등록 일자 시작
-	private String schDetailRegDtTo;	// 상세 검색 등록 일자 종료
-	private String schDetailRgtrOpt;	// 상세 검색 등록 사용자 구분
-	private String schDetailRgtrNm;		// 상세 검색 등록 사용자 명
-	private String schDetailRgtrCd;		// 상세 검색 등록 사용자 코드
+
 	// 동적 검색 조건
 	private String vhrno;				// 단속(TB_CRDN)_차량번호
 	private String rtpyrNm;				// 납부자(TB_PAYER)_납부자 명
@@ -325,60 +320,8 @@ public class EpostQuery extends CmmnQuery {
 	}
 
 	// 상세 검색 조건 ///////////////////////////////////////////////////////////////
-	public String getSchDetailRegDtOpt() {
-		return ifEmpty(schDetailRegDtOpt, () -> null);
-	}
-
-	public <T extends EpostQuery> T setSchDetailRegDtOpt(String schDetailRegDtOpt) {
-		this.schDetailRegDtOpt = schDetailRegDtOpt;
-		return self();
-	}
-
-	public String getSchDetailRegDtFrom() {
-		return ifEmpty(schDetailRegDtFrom, () -> null);
-	}
-
-	public <T extends EpostQuery> T setSchDetailRegDtFrom(String schDetailRegDtFrom) {
-		this.schDetailRegDtFrom = schDetailRegDtFrom;
-		return self();
-	}
-
-	public String getSchDetailRegDtTo() {
-		return ifEmpty(schDetailRegDtTo, () -> null);
-	}
-
-	public <T extends EpostQuery> T setSchDetailRegDtTo(String schDetailRegDtTo) {
-		this.schDetailRegDtTo = schDetailRegDtTo;
-		return self();
-	}
 
-	public String getSchDetailRgtrOpt() {
-		return ifEmpty(schDetailRgtrOpt, () -> null);
-	}
-
-	public <T extends EpostQuery> T setSchDetailRgtrOpt(String schDetailRgtrOpt) {
-		this.schDetailRgtrOpt = schDetailRgtrOpt;
-		return self();
-	}
-
-	public String getSchDetailRgtrNm() {
-		return ifEmpty(schDetailRgtrNm, () -> null);
-	}
-
-	public <T extends EpostQuery> T setSchDetailRgtrNm(String schDetailRgtrNm) {
-		this.schDetailRgtrNm = schDetailRgtrNm;
-		return self();
-	}
-
-	public String getSchDetailRgtrCd() {
-		return ifEmpty(schDetailRgtrCd, () -> null);
-	}
-
-	public <T extends EpostQuery> T setSchDetailRgtrCd(String schDetailRgtrCd) {
-		this.schDetailRgtrCd = schDetailRgtrCd;
-		return self();
-	}
-	// 상세검색 조건 ///////////////////////////////////////////////////////////////
+	// 상세 검색 조건 ///////////////////////////////////////////////////////////////
 
 	// 동적 검색 조건 ///////////////////////////////////////////////////////////////
 	public String getVhrno() {
diff --git a/src/main/resources/sql/mapper/fims/epst/epostRcptRslt-mapper.xml b/src/main/resources/sql/mapper/fims/epst/epostRcptRslt-mapper.xml
index 1b6aad3e..2415296b 100644
--- a/src/main/resources/sql/mapper/fims/epst/epostRcptRslt-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/epst/epostRcptRslt-mapper.xml
@@ -67,34 +67,34 @@
            AND ERR.RCEPT_YMD <![CDATA[<=]]> #{schRceptYmdTo}            /* 접수 일자 종료 */
         </if>
         <choose>
-            <when test="schDetailRegDtOpt == 'regDt'">
-                <if test="schDetailRegDtFrom != null">
-           AND SUBSTR(ERR.REG_DT,1,8) <![CDATA[>=]]> #{schDetailRegDtFrom}      /* 등록 일자 시작 */
+            <when test="schRegDateOpt == 'regDt'">
+                <if test="schRegDateFrom != null">
+           AND SUBSTR(ERR.REG_DT,1,8) <![CDATA[>=]]> #{schRegDateFrom}  /* 등록 일자 시작 */
                 </if>
-                <if test="schDetailRegDtTo != null">
-           AND SUBSTR(ERR.REG_DT,1,8) <![CDATA[<=]]> #{schDetailRegDtTo}        /* 등록 일자 종료 */
+                <if test="schRegDateTo != null">
+           AND SUBSTR(ERR.REG_DT,1,8) <![CDATA[<=]]> #{schRegDateTo}    /* 등록 일자 종료 */
                 </if>
             </when>
-            <when test="schDetailRegDtOpt == 'mdfcnDt'">
-                <if test="schDetailRegDtFrom != null">
-           AND SUBSTR(ERR.MDFCN_DT,1,8) <![CDATA[>=]]> #{schDetailRegDtFrom}    /* 수정 일자 시작 */
+            <when test="schRegDateOpt == 'mdfcnDt'">
+                <if test="schRegDateFrom != null">
+           AND SUBSTR(ERR.MDFCN_DT,1,8) <![CDATA[>=]]> #{schRegDateFrom} /* 수정 일자 시작 */
                 </if>
-                <if test="schDetailRegDtTo != null">
-           AND SUBSTR(ERR.MDFCN_DT,1,8) <![CDATA[<=]]> #{schDetailRegDtTo}      /* 수정 일자 종료 */
+                <if test="schRegDateTo != null">
+           AND SUBSTR(ERR.MDFCN_DT,1,8) <![CDATA[<=]]> #{schRegDateTo}  /* 수정 일자 종료 */
                 </if>
             </when>
             <otherwise>
             </otherwise>
         </choose>
         <choose>
-            <when test="schDetailRgtrOpt == 'rgtr'">
-                <if test="schDetailRgtrCd != null">
-           AND ERR.RGTR         =  #{schDetailRgtrCd}   /* 등록자 코드 */
+            <when test="schRgtrOpt == 'rgtr'">
+                <if test="schRgtrCd != null">
+           AND ERR.RGTR         =  #{schRgtrCd}         /* 등록자 코드 */
                 </if>
             </when>
-            <when test="schDetailRgtrOpt == 'mdfr'">
-                <if test="schDetailRgtrCd != null">
-           AND ERR.MDFR         =  #{schDetailRgtrCd}   /* 수정자 코드 */
+            <when test="schRgtrOpt == 'mdfr'">
+                <if test="schRgtrCd != null">
+           AND ERR.MDFR         =  #{schRgtrCd}         /* 수정자 코드 */
                 </if>
             </when>
             <otherwise>
@@ -153,8 +153,8 @@
              , SUM(TOTPOST_PRC) AS TOTPOST_PRC      /* 우편요금 */
              , (SELECT GET_CODE_NM('EGP002', DIV_KB) FROM DUAL) AS DIV_KB_NM    /* 취급 구분 명 */
           FROM TB_EPOST_RCPT_RSLT
-         WHERE CON_ORG      = #{conOrg}             /* 외부기관구분코드 */
-           AND RELORSECT_CD = #{relorsectCd}        /* 결제부서코드 */
+         WHERE CON_ORG          = #{conOrg}         /* 외부기관구분코드 */
+           AND RELORSECT_CD     = #{relorsectCd}    /* 결제부서코드 */
         <if test="schExtriRegymdFrom != null">
            AND EXTRI_REGYMD <![CDATA[>=]]> #{schExtriRegymdFrom}        /* 기관발송일자 시작 */
         </if>
@@ -168,34 +168,34 @@
            AND RCEPT_YMD <![CDATA[<=]]> #{schRceptYmdTo}                /* 접수 일자 종료 */
         </if>
         <choose>
-            <when test="schDetailRegDtOpt == 'regDt'">
-                <if test="schDetailRegDtFrom != null">
-           AND SUBSTR(REG_DT,1,8) <![CDATA[>=]]> #{schDetailRegDtFrom}  /* 등록 일자 시작 */
+            <when test="schRegDateOpt == 'regDt'">
+                <if test="schRegDateFrom != null">
+           AND SUBSTR(REG_DT,1,8) <![CDATA[>=]]> #{schRegDateFrom}      /* 등록 일자 시작 */
                 </if>
-                <if test="schDetailRegDtTo != null">
-           AND SUBSTR(REG_DT,1,8) <![CDATA[<=]]> #{schDetailRegDtTo}    /* 등록 일자 종료 */
+                <if test="schRegDateTo != null">
+           AND SUBSTR(REG_DT,1,8) <![CDATA[<=]]> #{schRegDateTo}        /* 등록 일자 종료 */
                 </if>
             </when>
-            <when test="schDetailRegDtOpt == 'mdfcnDt'">
-                <if test="schDetailRegDtFrom != null">
-           AND SUBSTR(MDFCN_DT,1,8) <![CDATA[>=]]> #{schDetailRegDtFrom} /* 수정 일자 시작 */
+            <when test="schRegDateOpt == 'mdfcnDt'">
+                <if test="schRegDateFrom != null">
+           AND SUBSTR(MDFCN_DT,1,8) <![CDATA[>=]]> #{schRegDateFrom}    /* 수정 일자 시작 */
                 </if>
-                <if test="schDetailRegDtTo != null">
-           AND SUBSTR(MDFCN_DT,1,8) <![CDATA[<=]]> #{schDetailRegDtTo}  /* 수정 일자 종료 */
+                <if test="schRegDateTo != null">
+           AND SUBSTR(MDFCN_DT,1,8) <![CDATA[<=]]> #{schRegDateTo}      /* 수정 일자 종료 */
                 </if>
             </when>
             <otherwise>
             </otherwise>
         </choose>
         <choose>
-            <when test="schDetailRgtrOpt == 'rgtr'">
-                <if test="schDetailRgtrCd != null">
-           AND RGTR         =  #{schDetailRgtrCd}   /* 등록자 코드 */
+            <when test="schRgtrOpt == 'rgtr'">
+                <if test="schRgtrCd != null">
+           AND RGTR             =  #{schRgtrCd} /* 등록자 코드 */
                 </if>
             </when>
-            <when test="schDetailRgtrOpt == 'mdfr'">
-                <if test="schDetailRgtrCd != null">
-           AND MDFR         =  #{schDetailRgtrCd}   /* 수정자 코드 */
+            <when test="schRgtrOpt == 'mdfr'">
+                <if test="schRgtrCd != null">
+           AND MDFR             =  #{schRgtrCd} /* 수정자 코드 */
                 </if>
             </when>
             <otherwise>
diff --git a/src/main/webapp/WEB-INF/jsp/fims/epst/epst02050-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/epst/epst02050-main.jsp
index 363645ae..4c56f193 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/epst/epst02050-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/epst/epst02050-main.jsp
@@ -86,28 +86,28 @@
 							<div class="row g-1">
 								<!-- 등록일자, 수정일자 -->
 								<div class="col-6">
-									<select class="form-select text-center" id="schDetailRegDtOpt--${pageName}" name="schDetailRegDtOpt">
+									<select class="form-select text-center" id="schRegDateOpt--${pageName}" name="schRegDateOpt">
 										<option value="regDt">등록일자</option>
 										<option value="mdfcnDt">수정일자</option>
 									</select>
 									<span class="form-search-linebox">
-										<input type="text" class="form-control form-date" id="schDetailRegDtFrom--${pageName}" name="schDetailRegDtFrom"
+										<input type="text" class="form-control form-date" id="schRegDateFrom--${pageName}" name="schRegDateFrom"
 		                                	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="schDetailRegDtTo--${pageName}" name="schDetailRegDtTo"
+										<input type="text" class="form-control form-date" id="schRegDateTo--${pageName}" name="schRegDateTo"
 		                                	data-fmt-type="day" title="종료 날짜 선택">
 										<button type="button" class="bx bx-sm bx-calendar bg-white"></button>
 									</span>
 								</div>
 								<!-- 등록자명, 수정자명 -->
 								<div class="col-6">
-									<select class="form-select text-center" id="schDetailRgtrOpt--${pageName}" name="schDetailRgtrOpt">
+									<select class="form-select text-center" id="schRgtrOpt--${pageName}" name="schRgtrOpt">
 										<option value="rgtr">등록자</option>
 										<option value="mdfr">수정자</option>
 									</select>
-									<input type="hidden" id="schDetailRgtrCd--${pageName}" name="schDetailRgtrCd" />
-									<input type="text" class="form-control" id="schDetailRgtrNm--${pageName}" name="schDetailRgtrNm" />
+									<input type="hidden" id="schRgtrCd--${pageName}" name="schRgtrCd" />
+									<input type="text" class="form-control" id="schRgtrNm--${pageName}" name="schRgtrNm" />
 									<button type="button" class="btn btn-sm btn-outline-dark" id="btnFindUser--${pageName}" title="사용자 검색" onclick="fnFindUser${pageName}();">
 										검색
 									</button>
@@ -412,8 +412,8 @@
 
 	//
 	callbackFindUser${pageName} = (userId, userNm) => {
-		$("#schDetailRgtrCd--${pageName}").val(userId);			//
-		$("#schDetailRgtrNm--${pageName}").val(userNm);			//
+		$("#schRgtrCd--${pageName}").val(userId);		// 사용자 ID
+		$("#schRgtrNm--${pageName}").val(userNm);		// 사용자 명
 	}
 
 	// 사용자 검색