diff --git a/src/main/java/cokr/xit/fims/rent/Hirer.java b/src/main/java/cokr/xit/fims/rent/Hirer.java index fa3669e7..fd2e36f3 100644 --- a/src/main/java/cokr/xit/fims/rent/Hirer.java +++ b/src/main/java/cokr/xit/fims/rent/Hirer.java @@ -47,20 +47,10 @@ public class Hirer extends AbstractEntity { */ private String hirerSeCd; - /** - * 임차인 운전면허번호 - */ - private String hirerDln; - /** * 임차인 법인등록번호 */ - private String hirerCrno; - - /** - * 임차인 사업자등록번호 - */ - private String hirerBrno; + private String hirerRegNo; /** * 임차인 명 diff --git a/src/main/java/cokr/xit/fims/rent/RentQuery.java b/src/main/java/cokr/xit/fims/rent/RentQuery.java index 1a560449..958a9710 100644 --- a/src/main/java/cokr/xit/fims/rent/RentQuery.java +++ b/src/main/java/cokr/xit/fims/rent/RentQuery.java @@ -37,6 +37,7 @@ public class RentQuery extends CmmnQuery { private String schCtrtBgngYmd; // 계약 시작 일자 private String schCtrtEndYmd; // 계약 종료 일자 private String schVhrno; // 차량번호 + private String schHirerRegNo; // 임차인 등록 번호 private String[] omJnos; // 소유주 번호s private String omJno; // 소유주 번호 @@ -201,6 +202,14 @@ public class RentQuery extends CmmnQuery { this.schVhrno = schVhrno; } + public String getSchHirerRegNo() { + return ifEmpty(schHirerRegNo, () -> null); + } + + public void setSchHirerRegNo(String schHirerRegNo) { + this.schHirerRegNo = schHirerRegNo; + } + public String[] getOmJnos() { return ifEmpty(omJnos, () -> null); } diff --git a/src/main/resources/sql/mapper/fims/rent/hirer-mapper.xml b/src/main/resources/sql/mapper/fims/rent/hirer-mapper.xml index 05521cca..a8256882 100644 --- a/src/main/resources/sql/mapper/fims/rent/hirer-mapper.xml +++ b/src/main/resources/sql/mapper/fims/rent/hirer-mapper.xml @@ -15,9 +15,7 @@ - - - + @@ -50,9 +48,7 @@ , H.CTRT_END_YMD , H.CTRT_END_TM , H.HIRER_SE_CD - , H.HIRER_DLN - , H.HIRER_CRNO - , H.HIRER_BRNO + , H.HIRER_REG_NO , H.HIRER_NM , H.HIRER_MBL_TELNO , H.HIRER_EML_ADDR @@ -98,6 +94,9 @@ AND H.VHRNO = #{schVhrno} + + AND H.HIRER_REG_NO = #{schHirerRegNo} + @@ -127,9 +126,7 @@ , CTRT_END_YMD , CTRT_END_TM , HIRER_SE_CD - , HIRER_DLN - , HIRER_CRNO - , HIRER_BRNO + , HIRER_REG_NO , HIRER_NM , HIRER_MBL_TELNO , HIRER_EML_ADDR @@ -158,9 +155,7 @@ , #{ctrtEndYmd} , #{ctrtEndTm} , #{hirerSeCd} - , #{hirerDln} - , #{hirerCrno} - , #{hirerBrno} + , #{hirerRegNo} , #{hirerNm} , #{hirerMblTelno} , #{hirerEmlAddr} @@ -189,9 +184,7 @@ , HIRE_BGNG_DT = #{hireBgngDt} , HIRE_END_DT = #{hireEndDt} , HIRER_SE_CD = #{hirerSeCd} - , HIRER_DLN = #{hirerDln} - , HIRER_CRNO = #{hirerCrno} - , HIRER_BRNO = #{hirerBrno} + , HIRER_REG_NO = #{hirerRegNo} , HIRER_NM = #{hirerNm} , HIRER_MBL_TELNO = #{hirerMblTelno} , HIRER_EML_ADDR = #{hirerEmlAddr}