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 3cfcb04d..7e0a4269 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 @@ -316,18 +316,30 @@ public class NisIndivBean extends AbstractBean { driverVO.setSggCd(sggCd); driverVO.setTaskSeCd(taskSeCd); driverVO.setAprvId(aprvId); - driverVO.setPyrNm(items[4-1]); - driverVO.setOmJno(items[5-1]); - driverVO.setLotnoRoadAddrSeCd(items[6-1]); - driverVO.setZip(items[7-1]); + + driverVO.setNpaLinkRspnsNm(items[4-1]); + driverVO.setPyrNm(items[5-1]); + driverVO.setOmJno(items[6-1]); + driverVO.setLotnoRoadAddrSeCd(items[7-1]); driverVO.setRoadNmCd(items[8-1]); driverVO.setAddrUdgdYn(items[9-1]); - driverVO.setBmno(items[10-1]); - driverVO.setBsno(items[11-1]); - driverVO.setAddr(items[12-1]); - driverVO.setDaddr(items[13-1]); - driverVO.setStdgCd(items[14-1]); - driverVO.setDongCd(items[15-1]); + + String bmno = items[10-1]; + if(bmno.equals("")) { + bmno = null; + } + driverVO.setBmno(bmno); + String bsno = items[11-1]; + if(bsno.equals("")) { + bsno = null; + } + driverVO.setBsno(bsno); + + driverVO.setZip(items[12-1]); + driverVO.setAddr(items[13-1]); + driverVO.setDaddr(items[14-1]); + driverVO.setStdgCd(items[15-1]); + driverVO.setDongCd(items[16-1]); results.add(driverVO); 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 3f759848..1d977ccd 100644 --- a/src/main/resources/sql/mapper/fims/nxrp/nisIndiv-mapper.xml +++ b/src/main/resources/sql/mapper/fims/nxrp/nisIndiv-mapper.xml @@ -17,6 +17,7 @@ SELECT LA.VHRNO AND LA.SGG_CD = #{sggCd} AND LA.CHG_APRV_STTS_CD = 'RQ' AND LA.NPA_LINK_YN = 'N' + AND LA.DEL_YN = 'N' \ No newline at end of file diff --git a/src/main/resources/sql/mapper/fims/rent/lsctAprv-mapper.xml b/src/main/resources/sql/mapper/fims/rent/lsctAprv-mapper.xml index 5e47bb38..1ab373a0 100644 --- a/src/main/resources/sql/mapper/fims/rent/lsctAprv-mapper.xml +++ b/src/main/resources/sql/mapper/fims/rent/lsctAprv-mapper.xml @@ -421,16 +421,18 @@ UPDATE ${lsctLinkTblNm} SET NPA_LINK_YN = 'Y' - , OM_JNO = #{omJno} - , HIRER_NM = #{pyrNm} - , HIRER_ZIP = #{zip} - , HIRER_ADDR = #{addr} - , HIRER_DTL_ADDR = #{daddr} - , ROAD_NM_CD = #{roadNmCd} - , UDGD_SE_CD = #{addrUdgdYn} - , BMNO = #{bmno} - , BSNO = #{bsno} - , STDG_CD = #{stdgCd} + + , OM_JNO = #{omJno} + , HIRER_NM = #{pyrNm} + , HIRER_ZIP = (CASE WHEN HIRER_ADDR = '' OR HIRER_ADDR IS NULL THEN #{zip} ELSE HIRER_ZIP END) + , HIRER_ADDR = (CASE WHEN HIRER_ADDR = '' OR HIRER_ADDR IS NULL THEN #{addr} ELSE HIRER_ADDR END) + , HIRER_DTL_ADDR = (CASE WHEN HIRER_ADDR = '' OR HIRER_ADDR IS NULL THEN #{daddr} ELSE HIRER_DTL_ADDR END) + , ROAD_NM_CD = (CASE WHEN HIRER_ADDR = '' OR HIRER_ADDR IS NULL THEN #{roadNmCd} ELSE ROAD_NM_CD END) + , UDGD_SE_CD = (CASE WHEN HIRER_ADDR = '' OR HIRER_ADDR IS NULL THEN #{addrUdgdYn} ELSE UDGD_SE_CD END) + , BMNO = (CASE WHEN HIRER_ADDR = '' OR HIRER_ADDR IS NULL THEN #{bmno} ELSE BMNO END) + , BSNO = (CASE WHEN HIRER_ADDR = '' OR HIRER_ADDR IS NULL THEN #{bsno} ELSE BSNO END) + , STDG_CD = (CASE WHEN HIRER_ADDR = '' OR HIRER_ADDR IS NULL THEN #{stdgCd} ELSE STDG_CD END) + WHERE APRV_ID = #{aprvId} AND CHG_APRV_STTS_CD = 'RQ' AND DEL_YN = 'N'