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 setSchDetailCrdnRegDtOpt(String schDetailCrdnRegDtOpt) { - this.schDetailCrdnRegDtOpt = schDetailCrdnRegDtOpt; - return self(); - } - - public String getSchDetailCrdnRegDtFrom() { - return ifEmpty(schDetailCrdnRegDtFrom, () -> null); - } - - public T setSchDetailCrdnRegDtFrom(String schDetailCrdnRegDtFrom) { - this.schDetailCrdnRegDtFrom = schDetailCrdnRegDtFrom; - return self(); - } - - public String getSchDetailCrdnRegDtTo() { - return ifEmpty(schDetailCrdnRegDtTo, () -> null); - } - - public 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 setSchDetailCrdnRgtrOpt(String schDetailCrdnRgtrOpt) { - this.schDetailCrdnRgtrOpt = schDetailCrdnRgtrOpt; + public 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 setSchDetailCrdnRgtrNm(String schDetailCrdnRgtrNm) { - this.schDetailCrdnRgtrNm = schDetailCrdnRgtrNm; + public 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 setSchDetailCrdnRgtrCd(String schDetailCrdnRgtrCd) { - this.schDetailCrdnRgtrCd = schDetailCrdnRgtrCd; + public 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 setSchDetailRegDtOpt(String schDetailRegDtOpt) { - this.schDetailRegDtOpt = schDetailRegDtOpt; - return self(); - } - - public String getSchDetailRegDtFrom() { - return ifEmpty(schDetailRegDtFrom, () -> null); - } - - public T setSchDetailRegDtFrom(String schDetailRegDtFrom) { - this.schDetailRegDtFrom = schDetailRegDtFrom; - return self(); - } - - public String getSchDetailRegDtTo() { - return ifEmpty(schDetailRegDtTo, () -> null); - } - - public T setSchDetailRegDtTo(String schDetailRegDtTo) { - this.schDetailRegDtTo = schDetailRegDtTo; - return self(); - } - public String getSchDetailRgtrOpt() { - return ifEmpty(schDetailRgtrOpt, () -> null); - } - - public T setSchDetailRgtrOpt(String schDetailRgtrOpt) { - this.schDetailRgtrOpt = schDetailRgtrOpt; - return self(); - } - - public String getSchDetailRgtrNm() { - return ifEmpty(schDetailRgtrNm, () -> null); - } - - public T setSchDetailRgtrNm(String schDetailRgtrNm) { - this.schDetailRgtrNm = schDetailRgtrNm; - return self(); - } - - public String getSchDetailRgtrCd() { - return ifEmpty(schDetailRgtrCd, () -> null); - } - - public 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 #{schRceptYmdTo} /* 접수 일자 종료 */ - - - AND SUBSTR(ERR.REG_DT,1,8) =]]> #{schDetailRegDtFrom} /* 등록 일자 시작 */ + + + AND SUBSTR(ERR.REG_DT,1,8) =]]> #{schRegDateFrom} /* 등록 일자 시작 */ - - AND SUBSTR(ERR.REG_DT,1,8) #{schDetailRegDtTo} /* 등록 일자 종료 */ + + AND SUBSTR(ERR.REG_DT,1,8) #{schRegDateTo} /* 등록 일자 종료 */ - - - AND SUBSTR(ERR.MDFCN_DT,1,8) =]]> #{schDetailRegDtFrom} /* 수정 일자 시작 */ + + + AND SUBSTR(ERR.MDFCN_DT,1,8) =]]> #{schRegDateFrom} /* 수정 일자 시작 */ - - AND SUBSTR(ERR.MDFCN_DT,1,8) #{schDetailRegDtTo} /* 수정 일자 종료 */ + + AND SUBSTR(ERR.MDFCN_DT,1,8) #{schRegDateTo} /* 수정 일자 종료 */ - - - AND ERR.RGTR = #{schDetailRgtrCd} /* 등록자 코드 */ + + + AND ERR.RGTR = #{schRgtrCd} /* 등록자 코드 */ - - - AND ERR.MDFR = #{schDetailRgtrCd} /* 수정자 코드 */ + + + AND ERR.MDFR = #{schRgtrCd} /* 수정자 코드 */ @@ -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} /* 결제부서코드 */ AND EXTRI_REGYMD =]]> #{schExtriRegymdFrom} /* 기관발송일자 시작 */ @@ -168,34 +168,34 @@ AND RCEPT_YMD #{schRceptYmdTo} /* 접수 일자 종료 */ - - - AND SUBSTR(REG_DT,1,8) =]]> #{schDetailRegDtFrom} /* 등록 일자 시작 */ + + + AND SUBSTR(REG_DT,1,8) =]]> #{schRegDateFrom} /* 등록 일자 시작 */ - - AND SUBSTR(REG_DT,1,8) #{schDetailRegDtTo} /* 등록 일자 종료 */ + + AND SUBSTR(REG_DT,1,8) #{schRegDateTo} /* 등록 일자 종료 */ - - - AND SUBSTR(MDFCN_DT,1,8) =]]> #{schDetailRegDtFrom} /* 수정 일자 시작 */ + + + AND SUBSTR(MDFCN_DT,1,8) =]]> #{schRegDateFrom} /* 수정 일자 시작 */ - - AND SUBSTR(MDFCN_DT,1,8) #{schDetailRegDtTo} /* 수정 일자 종료 */ + + AND SUBSTR(MDFCN_DT,1,8) #{schRegDateTo} /* 수정 일자 종료 */ - - - AND RGTR = #{schDetailRgtrCd} /* 등록자 코드 */ + + + AND RGTR = #{schRgtrCd} /* 등록자 코드 */ - - - AND MDFR = #{schDetailRgtrCd} /* 수정자 코드 */ + + + AND MDFR = #{schRgtrCd} /* 수정자 코드 */ 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 @@
- - ~ -
- - - + + @@ -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); // 사용자 명 } // 사용자 검색