diff --git a/src/main/java/cokr/xit/adds/nims/DsuseMgtReceiptQuery.java b/src/main/java/cokr/xit/adds/nims/DsuseMgtReceiptQuery.java index e78d01c..789e1c9 100644 --- a/src/main/java/cokr/xit/adds/nims/DsuseMgtReceiptQuery.java +++ b/src/main/java/cokr/xit/adds/nims/DsuseMgtReceiptQuery.java @@ -10,10 +10,11 @@ public class DsuseMgtReceiptQuery extends QueryRequest{ private static final long serialVersionUID = 1L; //검색조건 - private String schDateOpt; + private String schSggCd; // 관활 관청 private String schDateFrom; // 검색 일자 시작 private String schDateTo; // 검색 일자 종료 - private String schBsshCd; // 검색 일자 종료 + private String schBsshCd; // 업체코드 + private String schSttsCd; // 진행상태코드 //폐기관리 private String dscdmngId; // 폐기관리 ID @@ -59,12 +60,12 @@ public class DsuseMgtReceiptQuery extends QueryRequest{ private String bsshSttsNm; // 상태 private String prmisnNo; // 허가 번호 - public String getschDateOpt() { - return ifEmpty(schDateOpt, () -> null); + public String getSchSggCd() { + return ifEmpty(schSggCd, () -> null); } - public T setschDateOpt(String schDateOpt) { - this.schDateOpt = schDateOpt; + public T setSchSggCd(String schSggCd) { + this.schSggCd = schSggCd; return self(); } @@ -95,6 +96,15 @@ public class DsuseMgtReceiptQuery extends QueryRequest{ return self(); } + public String getSchSttsCd() { + return ifEmpty(schSttsCd, () -> null); + } + + public T setSchSttsCd(String schSttsCd) { + this.schSttsCd = schSttsCd; + return self(); + } + public String getdscdmngId() { return ifEmpty(dscdmngId, () -> null); } 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 81dde78..c9c3e4e 100644 --- a/src/main/resources/sql/mapper/adds/nims/dsuseMgtReceipt-mapper.xml +++ b/src/main/resources/sql/mapper/adds/nims/dsuseMgtReceipt-mapper.xml @@ -50,15 +50,20 @@ WHERE 1=1 + + AND A.DEPT_CD = #{schSggCd} + AND A.HDR_DE =]]> #{schDateFrom} AND A.HDR_DE #{schDateTo} - - + AND B.BSSH_CD = #{schBsshCd} + + + AND A.PRGRS_STTS_CD = #{schSttsCd}