diff --git a/src/main/java/cokr/xit/adds/nims/DsuseMgtReceiptQuery.java b/src/main/java/cokr/xit/adds/nims/DsuseMgtReceiptQuery.java index 7e512b2..4439bca 100644 --- a/src/main/java/cokr/xit/adds/nims/DsuseMgtReceiptQuery.java +++ b/src/main/java/cokr/xit/adds/nims/DsuseMgtReceiptQuery.java @@ -18,13 +18,6 @@ public class DsuseMgtReceiptQuery extends QueryRequest{ //폐기관리 private String dscdmngId; // 폐기관리 ID -/* public String getDscdmngId() { - return dscdmngId; - } - - public void setDscdmngId(String dscdmngId) { - this.dscdmngId = dscdmngId; - }*/ private String deptCd; // 부서 코드 private String userId; // 사용자 ID @@ -60,6 +53,18 @@ public class DsuseMgtReceiptQuery extends QueryRequest{ private String bsshSttsNm; // 상태 private String prmisnNo; // 허가 번호 + private String nimsRptYn; // NIMS 보고 여부 + + public String getNimsRptYn() { + return ifEmpty(nimsRptYn, () -> null); + } + + public T setNimsRptYn(String nimsRptYn) { + this.nimsRptYn = nimsRptYn; + return self(); + } + + public String getSchSggCd() { return ifEmpty(schSggCd, () -> null); } diff --git a/src/main/resources/sql/mapper/adds/nims/dsuseMgtDoc-mapper.xml b/src/main/resources/sql/mapper/adds/nims/dsuseMgtDoc-mapper.xml index 40fd070..c5aa0f4 100644 --- a/src/main/resources/sql/mapper/adds/nims/dsuseMgtDoc-mapper.xml +++ b/src/main/resources/sql/mapper/adds/nims/dsuseMgtDoc-mapper.xml @@ -53,10 +53,10 @@ AND tdm.dept_cd = #{schSggCd} - AND tdm.hdr_de =]]> #{schDateFrom} + AND tdm.dsuse_de =]]> #{schDateFrom} - AND tdm.hdr_de #{schDateTo} + AND tdm.dsuse_de #{schDateTo} AND tdm.bssh_cd = #{schBsshCd} diff --git a/src/main/resources/sql/mapper/adds/nims/dsuseMgtReceipt-mapper.xml b/src/main/resources/sql/mapper/adds/nims/dsuseMgtReceipt-mapper.xml index 3917b3a..59bdc3a 100644 --- a/src/main/resources/sql/mapper/adds/nims/dsuseMgtReceipt-mapper.xml +++ b/src/main/resources/sql/mapper/adds/nims/dsuseMgtReceipt-mapper.xml @@ -58,12 +58,25 @@ AND A.DEPT_CD = #{schSggCd} - + + + AND A.HDR_DE =]]> #{schDateFrom} - - - AND A.HDR_DE #{schDateTo} - + + + AND A.HDR_DE #{schDateTo} + + + + + AND A.DSUSE_DE =]]> #{schDateFrom} + + + AND A.DSUSE_DE #{schDateTo} + + + + AND B.BSSH_CD = #{schBsshCd} diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseDoc-main.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseDoc-main.jsp index 6afe0e3..cbeace9 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseDoc-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseDoc-main.jsp @@ -22,14 +22,14 @@
- + ~ -  취급일자 적용 +  폐기일자 적용
@@ -103,14 +103,14 @@ 폐기일자 폐기방법 업체명 - 폐기결과보고서 - 처리내역및사진 - 취급일자 폐기건수 + 폐기결과보고서 + 처리내역및사진 처리상태 폐기사유 폐기구분 폐기장소 + 취급일자 @@ -127,19 +127,18 @@ {dsuse_de} {dsuse_mth_nm} {bssh_nm} + {rnd_dtl_rpt_cnt} {dsuse_rslt_doc} {dsuse_rslt_list_photo} - {hdr_de} - {rnd_dtl_rpt_cnt} {prgrs_stts_nm} {dsuse_prv_nm} {dsuse_se_nm} {dsuse_loc} -<%-- {USR_RPT_ID_NO}--%> + {hdr_de}