diff --git a/src/main/java/cokr/xit/fims/nxrp/Hirer.java b/src/main/java/cokr/xit/fims/nxrp/Hirer.java index 5d4537af..0c12f835 100644 --- a/src/main/java/cokr/xit/fims/nxrp/Hirer.java +++ b/src/main/java/cokr/xit/fims/nxrp/Hirer.java @@ -12,6 +12,7 @@ public class Hirer extends AbstractEntity { private String aprvId; private String sggCd; private String taskSeCd; + private String mmCode; private String npaLinkRspnsNm; private String pyrNm; private String omJno; diff --git a/src/main/java/cokr/xit/fims/nxrp/service/bean/NisIndivBean.java b/src/main/java/cokr/xit/fims/nxrp/service/bean/NisIndivBean.java index 58bc1d31..a9ed1932 100644 --- a/src/main/java/cokr/xit/fims/nxrp/service/bean/NisIndivBean.java +++ b/src/main/java/cokr/xit/fims/nxrp/service/bean/NisIndivBean.java @@ -29,7 +29,9 @@ import cokr.xit.fims.nxrp.Hirer; import cokr.xit.fims.nxrp.NisIndivQuery; import cokr.xit.fims.nxrp.dao.NisIndivMapper; import cokr.xit.fims.nxrp.support.OnlyTxtMaker; +import cokr.xit.fims.rent.RentQuery; import cokr.xit.fims.rent.dao.LsctAprvMapper; +import cokr.xit.fims.rent.dao.LsctMpngMapper; import cokr.xit.foundation.component.AbstractBean; import cokr.xit.foundation.data.DataObject; @@ -45,6 +47,9 @@ public class NisIndivBean extends AbstractBean { @Resource(name="lsctAprvMapper") private LsctAprvMapper lsctAprvMapper; + @Resource(name="lsctAprvMapper") + private LsctMpngMapper lsctMpngMapper; + /** 설정 정보 DAO */ @Resource(name="stngMapper") protected StngMapper stngMapper; @@ -341,11 +346,13 @@ public class NisIndivBean extends AbstractBean { String srcSstKey = items[2-1]; String sggCd = srcSstKey.substring(0,5); String taskSeCd = srcSstKey.substring(5,8); - String aprvId = srcSstKey.substring(8); + String aprvId = srcSstKey.substring(8,18); + String mmCode = srcSstKey.substring(18); driverVO.setSggCd(sggCd); driverVO.setTaskSeCd(taskSeCd); driverVO.setAprvId(aprvId); + driverVO.setMmCode(mmCode); driverVO.setNpaLinkRspnsNm(items[4-1]); driverVO.setPyrNm(items[5-1]); @@ -427,6 +434,35 @@ public class NisIndivBean extends AbstractBean { String table = "TB_LSCT_APRV_"+driverInfo.getSggCd()+"_"+driverInfo.getTaskSeCd(); driverInfo.setLsctLinkTblNm(table); + if(ifEmpty(driverInfo.getAddr(), ()->"").equals("")) { + + RentQuery query = new RentQuery(); + query.setTaskSeCd(driverInfo.getTaskSeCd()); + query.setMmCode(driverInfo.getMmCode()); + DataObject addrInfo = lsctMpngMapper.selectIsCrdnInfo(query); + driverInfo.setZip(addrInfo.string("ZIP")); + driverInfo.setAddr(addrInfo.string("ADDR")); + driverInfo.setDaddr(addrInfo.string("DTL_ADDR")); + driverInfo.setRoadNmCd(addrInfo.string("ROAD_NM_CD")); + driverInfo.setAddrUdgdYn(addrInfo.string("UDGD_SE_CD")); + driverInfo.setBmno(addrInfo.string("BMNO")); + driverInfo.setBsno(addrInfo.string("BSNO")); + driverInfo.setStdgCd(addrInfo.string("STDG_CD")); + + if(driverInfo.getAddrUdgdYn().equals("Y")) { + driverInfo.setAddrUdgdYn("1"); + } else if(driverInfo.getAddrUdgdYn().equals("N")) { + driverInfo.setAddrUdgdYn("0"); + } + if("".equals(driverInfo.getBmno())) { + driverInfo.setBmno(null); + } + if("".equals(driverInfo.getBsno())) { + driverInfo.setBsno(null); + } + + } + return lsctAprvMapper.updateDriverInfo(driverInfo) == 1 ? true : false; } diff --git a/src/main/java/cokr/xit/fims/nxrp/support/OnlyTxtMaker.java b/src/main/java/cokr/xit/fims/nxrp/support/OnlyTxtMaker.java index 90233d9b..eb7ee1df 100644 --- a/src/main/java/cokr/xit/fims/nxrp/support/OnlyTxtMaker.java +++ b/src/main/java/cokr/xit/fims/nxrp/support/OnlyTxtMaker.java @@ -38,7 +38,7 @@ public class OnlyTxtMaker extends LinkFileMaker { public UnnamedItems extract(DataObject rentInfo, String sggCd, String taskSeCd) { UnnamedItems u = new UnnamedItems(); u.setItemLength(10); - u.set(1, sggCd+taskSeCd+rentInfo.string("APRV_ID")); + u.set(1, sggCd+taskSeCd+rentInfo.string("APRV_ID")+rentInfo.string("MM_CODE")); u.set(2, rentInfo.string("DEPT_CD")); u.set(3, rentInfo.string("RENT_ENT_NM")); u.set(4, rentInfo.string("RENT_ENT_REG_NO")); diff --git a/src/main/java/cokr/xit/fims/rent/service/bean/LsctMpngBean.java b/src/main/java/cokr/xit/fims/rent/service/bean/LsctMpngBean.java index 01a0d3a5..4048a32e 100644 --- a/src/main/java/cokr/xit/fims/rent/service/bean/LsctMpngBean.java +++ b/src/main/java/cokr/xit/fims/rent/service/bean/LsctMpngBean.java @@ -787,15 +787,29 @@ public class LsctMpngBean extends AbstractBean { lsctAprv.setHirerTelno(lsctMpngInfo.string("HIRER_TELNO")); // 임차인 전화번호 lsctAprv.setHirerMblTelno(lsctMpngInfo.string("HIRER_MBL_TELNO")); // 임차인 휴대 전화번호 lsctAprv.setHirerEmlAddr(lsctMpngInfo.string("HIRER_EML_ADDR")); // 임차인 이메일 주소 - lsctAprv.setHirerZip(lsctMpngInfo.string("HIRER_ZIP")); // 임차인 우편번호 - lsctAprv.setHirerAddr(lsctMpngInfo.string("HIRER_ADDR")); // 임차인 주소 - lsctAprv.setHirerDtlAddr(lsctMpngInfo.string("HIRER_DTL_ADDR")); // 임차인 상세 주소 - lsctAprv.setRoadNmCd(lsctMpngInfo.string("ROAD_NM_CD")); // 도로 명 코드 - lsctAprv.setUdgdSeCd(lsctMpngInfo.string("UDGD_SE_CD")); // 지하 구분 코드 - lsctAprv.setBmno(lsctMpngInfo.string("BMNO")); // 건물본번 - lsctAprv.setBsno(lsctMpngInfo.string("BSNO")); // 건물부번 - lsctAprv.setBldgMngNo(lsctMpngInfo.string("BLDG_MNG_NO")); // 건물 관리 번호 - lsctAprv.setStdgCd(lsctMpngInfo.string("STDG_CD")); // 법정동 코드 + + if(!lsctMpngInfo.string("HIRER_SE_CD").equals("01") && lsctMpngInfo.string("HIRER_ADDR").equals("")){ + lsctAprv.setHirerZip(crdnInfo.string("ZIP")); // 임차인 우편번호 + lsctAprv.setHirerAddr(crdnInfo.string("ADDR")); // 임차인 주소 + lsctAprv.setHirerDtlAddr(crdnInfo.string("DTL_ADDR")); // 임차인 상세 주소 + lsctAprv.setRoadNmCd(crdnInfo.string("ROAD_NM_CD")); // 도로 명 코드 + lsctAprv.setUdgdSeCd(crdnInfo.string("UDGD_SE_CD")); // 지하 구분 코드 + lsctAprv.setBmno(crdnInfo.string("BMNO")); // 건물본번 + lsctAprv.setBsno(crdnInfo.string("BSNO")); // 건물부번 + lsctAprv.setBldgMngNo(crdnInfo.string("BLDG_MNG_NO")); // 건물 관리 번호 + lsctAprv.setStdgCd(crdnInfo.string("STDG_CD")); // 법정동 코드 + } else { + lsctAprv.setHirerZip(lsctMpngInfo.string("HIRER_ZIP")); // 임차인 우편번호 + lsctAprv.setHirerAddr(lsctMpngInfo.string("HIRER_ADDR")); // 임차인 주소 + lsctAprv.setHirerDtlAddr(lsctMpngInfo.string("HIRER_DTL_ADDR")); // 임차인 상세 주소 + lsctAprv.setRoadNmCd(lsctMpngInfo.string("ROAD_NM_CD")); // 도로 명 코드 + lsctAprv.setUdgdSeCd(lsctMpngInfo.string("UDGD_SE_CD")); // 지하 구분 코드 + lsctAprv.setBmno(lsctMpngInfo.string("BMNO")); // 건물본번 + lsctAprv.setBsno(lsctMpngInfo.string("BSNO")); // 건물부번 + lsctAprv.setBldgMngNo(lsctMpngInfo.string("BLDG_MNG_NO")); // 건물 관리 번호 + lsctAprv.setStdgCd(lsctMpngInfo.string("STDG_CD")); // 법정동 코드 + } + lsctAprv.setRentEntNm(lsctMpngInfo.string("ENT_NM")); // 임대 기업 명 lsctAprv.setRentEntRegNo(lsctMpngInfo.string("ENT_REG_NO")); // 임대 기업 등록 번호 lsctAprv.setRentEntTelno(lsctMpngInfo.string("ENT_TELNO")); // 임대 기업 전화번호 @@ -804,8 +818,8 @@ public class LsctMpngBean extends AbstractBean { lsctAprv.setRentEntZip(lsctMpngInfo.string("ENT_ZIP")); // 임대 기업 우편번호 lsctAprv.setRentEntAddr(lsctMpngInfo.string("ENT_ADDR")); // 임대 기업 주소 lsctAprv.setRentEntDtlAddr(lsctMpngInfo.string("ENT_DTL_ADDR")); // 임대 기업 상세 주소 + lsctAprv.setAtchFileCnt(lsctMpngInfo.number("ATCH_FILE_CNT").intValue()); // 첨부 파일 수 -// file이 있는 경로 확인필요.. lsctAprv.setLsctSrvcUrl(FimsConf.get().getFormProtocolToContext()); // 임대차계약 서비스 URL // 임차인 ID로 파일(TB_FILE) 정보 조회 diff --git a/src/main/resources/sql/mapper/fims/nxrp/nisIndiv-mapper.xml b/src/main/resources/sql/mapper/fims/nxrp/nisIndiv-mapper.xml index e43fad99..c17ede20 100644 --- a/src/main/resources/sql/mapper/fims/nxrp/nisIndiv-mapper.xml +++ b/src/main/resources/sql/mapper/fims/nxrp/nisIndiv-mapper.xml @@ -9,6 +9,7 @@ SELECT LA.VHRNO , REPLACE(LA.RENT_ENT_NM,' ','') AS RENT_ENT_NM , LA.RENT_ENT_REG_NO , LA.APRV_ID + , LA.MM_CODE , LA.CTRT_BGNG_YMD , LA.CTRT_END_YMD , '' AS CTRT_NO diff --git a/src/main/resources/sql/mapper/fims/rent/lsctMpng-mapper.xml b/src/main/resources/sql/mapper/fims/rent/lsctMpng-mapper.xml index b2ce477e..496d1602 100644 --- a/src/main/resources/sql/mapper/fims/rent/lsctMpng-mapper.xml +++ b/src/main/resources/sql/mapper/fims/rent/lsctMpng-mapper.xml @@ -192,8 +192,21 @@ , C.NXRP_CRDN_LINK_YN , C.MM_CODE , L.LEVY_ID + , PA.ADDR_INPT_SE_CD + , PA.ADDR_SE_CD + , PA.ZIP + , PA.ADDR + , PA.DTL_ADDR + , PA.ROAD_NM_CD + , PA.UDGD_SE_CD + , PA.BMNO + , PA.BSNO + , PA.BLDG_MNG_NO + , PA.STDG_CD FROM TB_CRDN C LEFT OUTER JOIN TB_LEVY L ON (C.CRDN_ID = L.CRDN_ID) + LEFT OUTER JOIN TB_PAYER P ON (C.RTPYR_ID = P.RTPYR_ID) + LEFT OUTER JOIN TB_PAYER_ADDR PA ON (C.RTPYR_ID = PA.RTPYR_ID AND C.ADDR_SN = PA.ADDR_SN)