diff --git a/src/main/java/cokr/xit/fims/sndb/SndbQuery.java b/src/main/java/cokr/xit/fims/sndb/SndbQuery.java index ab8f5817..649e0027 100644 --- a/src/main/java/cokr/xit/fims/sndb/SndbQuery.java +++ b/src/main/java/cokr/xit/fims/sndb/SndbQuery.java @@ -41,6 +41,7 @@ public class SndbQuery extends CmmnQuery { private String schSvbtcYmdFrom; // 공시송달(TB_SVBTC)_공시송달 일자 시작 private String schSvbtcYmdTo; // 공시송달(TB_SVBTC)_공시송달 일자 종료 private String schSndngSeCd; // 발송, 발송상세(TB_SNDNG_DTL)_발송 구분 코드 + private String schUndlvrRsnCd; // 발송상세(TB_SNDNG_DTL)_미배달 사유 코드 private String schChcRgIndct; // 선택 등기 표시 // 상세 검색 조건 @@ -280,6 +281,16 @@ public class SndbQuery extends CmmnQuery { return self(); } + public String getSchUndlvrRsnCd() { + return ifEmpty(schUndlvrRsnCd, () -> null); + } + + public T setSchUndlvrRsnCd(String schUndlvrRsnCd) { + this.schUndlvrRsnCd = schUndlvrRsnCd; + + return self(); + } + public String getSchChcRgIndct() { return ifEmpty(schChcRgIndct, () -> null); } diff --git a/src/main/java/cokr/xit/fims/sndb/web/Sndb01Controller.java b/src/main/java/cokr/xit/fims/sndb/web/Sndb01Controller.java index 9812b753..2f7faff9 100644 --- a/src/main/java/cokr/xit/fims/sndb/web/Sndb01Controller.java +++ b/src/main/java/cokr/xit/fims/sndb/web/Sndb01Controller.java @@ -1170,9 +1170,9 @@ public class Sndb01Controller extends ApplicationController { ManagedUser managedUser = (ManagedUser)currentUser().getUser(); // View(jsp)에서 사용할 공통코드를 조회 - Map> commonCodes = getCodesOf("FIM004", "FIM005", "FIM006", "FIM047", "FIM054", "FIM061", "FIM064"); + Map> commonCodes = getCodesOf("FIM004", "FIM005", "FIM006", "FIM047", "FIM054", "FIM061", "FIM064", "FIM081"); - addCodes(commonCodes, mav, "FIM004", "FIM005", "FIM006", "FIM054", "FIM061", "FIM064"); + addCodes(commonCodes, mav, "FIM004", "FIM005", "FIM006", "FIM061", "FIM064"); return mav.addObject("pageName", "sndb01220") // View(jsp)에서 사용할 id 뒤에 붙일 suffix .addObject("infoPrefix", "sndbk") // prefix @@ -1185,6 +1185,7 @@ public class Sndb01Controller extends ApplicationController { .addObject("FIM054List", commonCodes.get("FIM054")) // 업무 구분 코드(TASK_SE_CD) .addObject("FIM061List", commonCodes.get("FIM061")) // 전기차 충전구역 및 충전방해 위반 코드(VLTN_ID) .addObject("FIM064List", commonCodes.get("FIM064")) // 화물자동차 밤샘주차 위반 코드(VLTN_ID) + .addObject("FIM081List", commonCodes.get("FIM081")) // 미배달 사유 코드(UNDLVR_RSN_CD) ; } diff --git a/src/main/resources/sql/mapper/fims/sndb/sndngDtl-mapper.xml b/src/main/resources/sql/mapper/fims/sndb/sndngDtl-mapper.xml index abfd44e3..a7021ee5 100644 --- a/src/main/resources/sql/mapper/fims/sndb/sndngDtl-mapper.xml +++ b/src/main/resources/sql/mapper/fims/sndb/sndngDtl-mapper.xml @@ -873,6 +873,12 @@ AND SD.SNDNG_SE_CD = #{schSndngSeCd} + + AND SD.UNDLVR_RSN_CD = #{schUndlvrRsnCd} + + + AND SD.DEL_YN = #{delYN} + AND C.CRDN_YMD =]]> #{schCrdnYmdFrom} @@ -881,9 +887,6 @@ AND C.VHRNO = #{schVhrno} - - - AND SD.DEL_YN = #{delYN} AND C.DEL_YN = 'N' diff --git a/src/main/webapp/WEB-INF/jsp/fims/epst/epst02010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/epst/epst02010-main.jsp index f1232387..91534c64 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/epst/epst02010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/epst/epst02010-main.jsp @@ -10,190 +10,189 @@
-
- -
- + + - - - - -
- - - -
- - - - -
diff --git a/src/main/webapp/WEB-INF/jsp/fims/epst/epst02030-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/epst/epst02030-main.jsp index befebad5..7f906603 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/epst/epst02030-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/epst/epst02030-main.jsp @@ -10,277 +10,276 @@
-
- -
- + + - - - - -
- - - -
- - - - - - -