위택스 납부자변경 수정

src/main/java/cokr/xit/fims/rent/RentQuery.java

@@ -58,6 +58,9 @@ public class RentQuery extends CmmnQuery {
     private String callPurpose;                                                 // infoDialog 호출 용도(view 조회(편집불가), create 등록, update 수정, refresh 재조회).
     private String delRsn;                                                      // 삭제 사유
     private String ffnlgSysInqYn;                                               // 과태료 시스템 조회 여부
+    private String hirerMpngYn;                                                 // 임차인 매핑 여부
+    private String crdnDt;
+    private String epayno;
 
     private String cellDataDef;
 
@@ -349,6 +352,31 @@ public class RentQuery extends CmmnQuery {
     public void setFfnlgSysInqYn(String ffnlgSysInqYn) {
         this.ffnlgSysInqYn = ffnlgSysInqYn;
     }
+
+    public String getHirerMpngYn() {
+        return ifEmpty(hirerMpngYn, () -> null);
+    }
+
+    public void setHirerMpngYn(String hirerMpngYn) {
+        this.hirerMpngYn = hirerMpngYn;
+    }
+
+    public String getCrdnDt() {
+        return ifEmpty(crdnDt, () -> null);
+    }
+
+    public void setCrdnDt(String crdnDt) {
+        this.crdnDt = crdnDt;
+    }
+
+    public String getEpayno() {
+        return ifEmpty(epayno, () -> null);
+    }
+
+    public void setEpayno(String epayno) {
+        this.epayno = epayno;
+    }
+
     // ETC /////////////////////////////////////////////////////////////////////
 
     public String getCellDataDef() {

src/main/java/cokr/xit/fims/rent/web/Rent04Controller.java

@@ -199,11 +199,10 @@ public class Rent04Controller extends ApplicationController {
                 	//D,G 컬럼 사용가능하면
             		if(useable) {
                 		RentQuery lsctQuery = new RentQuery();
-                		//매핑아이디 IS NOT NULL
+                		lsctQuery.setHirerMpngYn("Y");
                     	lsctQuery.setEntIds(entIds);
                     	lsctQuery.setSchVhrno(extractVhrno);
-                    	//lsctQuery.set(crdnDt.substring(0, 8)); //TODO:단속일자
-                    	//lsctQuery.set(crdnDt.substring(8));    //TODO:단속시간
+                    	lsctQuery.setCrdnDt(crdnDt);
                     	//TODO:과태료구분
                     	searchResults = lsctMpngMapper.selectCrdnList(lsctQuery);
 
@@ -216,9 +215,9 @@ public class Rent04Controller extends ApplicationController {
             		//차량번호,단속일시로 찾지못하면
             		if(!find) {
 	                	RentQuery lsctQuery = new RentQuery();
-	                	//매핑아이디 IS NOT NULL
+	                	lsctQuery.setHirerMpngYn("Y");
 	                	lsctQuery.setEntIds(entIds);
-	                	//lsctQuery.set(epaynoColumn); //TODO:전자납부번호
+	                	lsctQuery.setEpayno(epaynoColumn);
 
 	                	searchResults = lsctMpngMapper.selectCrdnList(lsctQuery);
 
@@ -228,8 +227,9 @@ public class Rent04Controller extends ApplicationController {
 	                	}
             		}
 
+            		if(find) {
             			resultRow.set("K", searchResult1.string("HIRER_NM"));
-                	if(searchResult1.string("HIRER_SE_CD").equals("99")) {
+                    	if(searchResult1.string("HIRER_SE_CD").equals("99")) { //TODO: 면허번호입력여부
                     		resultRow.set("L", searchResult1.string("HIRER_REG_NO"));
                     	} else {
                     		resultRow.set("M", searchResult1.string("HIRER_REG_NO"));
@@ -237,6 +237,7 @@ public class Rent04Controller extends ApplicationController {
                     	resultRow.set("N", searchResult1.string("HIRER_ADDR"));
                     	resultRow.set("O", searchResult1.string("HIRER_DTL_ADDR"));
                     	resultRow.set("P", searchResult1.string("HIRER_ZIP"));
+            		}
 
                 	result.add(resultRow);
                 }

src/main/resources/sql/mapper/fims/rent/lsctMpng-mapper.xml

@@ -364,6 +364,21 @@
             <if test="taskSeCd != null">
            AND C.TASK_SE_CD = #{taskSeCd}   <!-- 업무 구분 코드 -->
             </if>
+            <if test='hirerMpngYn == "Y"'>
+           AND LM.LSCT_MPNG_ID IS NOT NULL AND LM.LSCT_MPNG_ID != ''
+            </if>
+            <if test="entIds != null">
+           AND L.ENT_ID         IN (        <!-- 기업 IDs -->
+                <foreach collection="entIds" item="entId" separator=","> #{entId} </foreach>
+             )
+            </if>
+            <if test="crdnDt != null">
+           AND CONCAT(L.CTRT_BGNG_YMD,L.CTRT_BGNG_TM) <![CDATA[>=]]> #{crdnDt}
+           AND CONCAT(L.CTRT_END_YMD,L.CTRT_END_TM) <![CDATA[<=]]> #{crdnDt}
+            </if>
+            <if test="epayno != null">
+           AND LV.EPAYNO = #{epayno}
+            </if>
            AND C.DEL_YN     = 'N'       <!-- 단속 삭제 여부 -->
         </where>
         <include refid="utility.orderBy" />