Merge branch 'main' of http://xit.xit-git.com:3000/xit-app/adds-fo

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 extends DsuseMgtReceiptQuery> T setschDateOpt(String schDateOpt) {
-		this.schDateOpt = schDateOpt;
+	public <T extends DsuseMgtReceiptQuery> 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 extends DsuseMgtReceiptQuery> T setSchSttsCd(String schSttsCd) {
+		this.schSttsCd = schSttsCd;
+		return self();
+	}
+	
 	public String getdscdmngId() {
 		return ifEmpty(dscdmngId, () -> null);
 	}

src/main/resources/sql/mapper/adds/nims/dsuseMgtReceipt-mapper.xml

@@ -50,15 +50,20 @@
         <include refid="utility.paging-prefix" />
         <include refid="select" />
          WHERE 1=1
+				<if test="schSggCd != null">
+					AND A.DEPT_CD       =   #{schSggCd}    <!-- 관할 관청 -->
+		        </if>
 				<if test="schDateFrom != null">
 					AND A.HDR_DE <![CDATA[>=]]> #{schDateFrom}    <!-- 취급 일자 시작 -->
 		        </if>
         		<if test="schDateTo != null">
 		           AND A.HDR_DE <![CDATA[<=]]> #{schDateTo}      <!-- 취급 일자 종료 -->
-		        </if>
-		        
+		        </if>	        
 				<if test="schBsshCd != null">
 					AND B.BSSH_CD       =  #{schBsshCd}  
+		        </if>		        
+				<if test="schSttsCd != null">
+					AND A.PRGRS_STTS_CD       =  #{schSttsCd}        <!-- 진행 상태 -->
 		        </if>
         <include refid="utility.orderBy" />
         <include refid="utility.paging-suffix" />