From ade8414c745bd3fb1f87fa59d525d27a279e1bab Mon Sep 17 00:00:00 2001 From: leebj Date: Mon, 24 Nov 2025 13:35:56 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9E=84=EC=B0=A8=EC=9D=B8=20=EC=A3=BC?= =?UTF-8?q?=EC=86=8C=20=EC=9E=85=EB=A0=A5=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xit/fims/appl/web/ApplController.java | 36 +++---------------- .../fims/nxrp/service/bean/NisIndivBean.java | 36 +++++++++++++++++++ .../xit/fims/nxrp/web/NxrpController.java | 2 +- .../fims/rent/service/bean/LsctMpngBean.java | 14 ++------ .../sql/mapper/fims/rent/lsctAprv-mapper.xml | 21 +++++------ 5 files changed, 53 insertions(+), 56 deletions(-) diff --git a/src/main/java/cokr/xit/fims/appl/web/ApplController.java b/src/main/java/cokr/xit/fims/appl/web/ApplController.java index 5c14752e..98522dd4 100644 --- a/src/main/java/cokr/xit/fims/appl/web/ApplController.java +++ b/src/main/java/cokr/xit/fims/appl/web/ApplController.java @@ -26,7 +26,6 @@ import cokr.xit.fims.appl.service.bean.ApplBean; import cokr.xit.fims.cmmn.CmmnUtil; import cokr.xit.fims.nxrp.dao.NisIndivMapper; import cokr.xit.fims.rent.LsctAprv; -import cokr.xit.fims.rent.RentQuery; import cokr.xit.fims.rent.dao.LsctMpngMapper; import cokr.xit.foundation.Downloadable; import cokr.xit.foundation.data.DataObject; @@ -368,37 +367,12 @@ public class ApplController extends AbstractController { } - RentQuery mmQuery = new RentQuery(); - mmQuery.setSggCd(sggCd); - mmQuery.setTaskSeCd(taskSeCd); - mmQuery.setMmCode(mmCode); - mmQuery.setOrderBy("MM_DATE, MM_TIME"); // 정렬 - List mainList = lsctMpngMapper.selectFfnlgMainList(mmQuery); - - if(mainList != null && !mainList.isEmpty()) { - DataObject mmInfo = mainList.get(0); - lsctAprv.setHirerZip(mmInfo.string("OM_ZIP")); - lsctAprv.setHirerAddr(mmInfo.string("OM_JUSO")); - lsctAprv.setHirerDtlAddr(mmInfo.string("OM_BUNJI")); - lsctAprv.setRoadNmCd(mmInfo.string("OM_DORO_CODE")); - lsctAprv.setUdgdSeCd(mmInfo.string("OM_BLD_POSITION")); - lsctAprv.setBmno(mmInfo.string("OM_BLD_NO1")); - lsctAprv.setBsno(mmInfo.string("OM_BLD_NO2")); - lsctAprv.setBldgMngNo(mmInfo.string("OM_BLD_ADMNO")); - lsctAprv.setStdgCd(mmInfo.string("OM_BDCODE")); + //테이블 insert처리를 위한 변환 + if(lsctAprv.getBmno() == null || "".equals(lsctAprv.getBmno())) { + lsctAprv.setBmno("0"); } - - - if("Y".equals(lsctAprv.getUdgdSeCd())) { - lsctAprv.setUdgdSeCd("1"); - } else if("N".equals(lsctAprv.getUdgdSeCd())) { - lsctAprv.setUdgdSeCd("0"); - } - if("".equals(lsctAprv.getBmno())) { - lsctAprv.setBmno(null); - } - if("".equals(lsctAprv.getBsno())) { - lsctAprv.setBsno(null); + if(lsctAprv.getBsno() == null || "".equals(lsctAprv.getBsno())) { + lsctAprv.setBsno("0"); } 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 560f994b..588959cb 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 @@ -9,8 +9,10 @@ import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.Collections; +import java.util.HashMap; import java.util.Iterator; import java.util.List; +import java.util.Map; import javax.annotation.Resource; @@ -29,6 +31,7 @@ import cokr.xit.fims.nxrp.Jeju02; import cokr.xit.fims.nxrp.NisIndivQuery; import cokr.xit.fims.nxrp.dao.NisIndivMapper; import cokr.xit.fims.nxrp.support.OnlyTxtMaker; +import cokr.xit.fims.payer.dao.PayerMapper; import cokr.xit.fims.rent.dao.LsctAprvMapper; import cokr.xit.fims.rent.dao.LsctMpngMapper; import cokr.xit.foundation.component.AbstractBean; @@ -65,6 +68,9 @@ public class NisIndivBean extends AbstractBean { @Resource(name="stngBean") protected StngBean stngBean; + @Resource(name="payerMapper") + protected PayerMapper payerMapper; + public enum WORKING_UNIT { DOWNLOAD_DIR, ZIP_PATH, TXT_PATH, TXT_LINE } @@ -399,6 +405,36 @@ public class NisIndivBean extends AbstractBean { String table = "TB_LSCT_APRV_"+driverInfo.getSggCd()+"_"+driverInfo.getTaskSeCd(); driverInfo.setLsctLinkTblNm(table); + if(driverInfo.getAddrUdgdYn() == null || driverInfo.getAddrUdgdYn().equals("")) { + driverInfo.setAddrUdgdYn("0"); + } else if(driverInfo.getAddrUdgdYn().equals("Y")) { + driverInfo.setAddrUdgdYn("1"); + } else if(driverInfo.getAddrUdgdYn().equals("N")) { + driverInfo.setAddrUdgdYn("0"); + } + if(driverInfo.getBmno() == null || driverInfo.getBmno().equals("")) { + driverInfo.setBmno("0"); + } + if(driverInfo.getBsno() == null || driverInfo.getBsno().equals("")) { + driverInfo.setBsno("0"); + } + + if(!ifEmpty(driverInfo.getAddr(), ()->"").equals("")) { + if(ifEmpty(driverInfo.getStdgCd(), ()->"").equals("") && !ifEmpty(driverInfo.getRoadNmCd(), ()->"").equals("")) { + Map addrSearchMap = new HashMap(); + addrSearchMap.put("roadNmCd", driverInfo.getRoadNmCd()); + addrSearchMap.put("udgdSeCd", driverInfo.getAddrUdgdYn()); + addrSearchMap.put("bmno", driverInfo.getBmno()); + addrSearchMap.put("bsno", driverInfo.getBsno()); + + DataObject addrInfo = payerMapper.selectAddrInfo(addrSearchMap); + if(addrInfo != null && !addrInfo.isEmpty() && !addrInfo.string("STDG_CD").equals("")) { + driverInfo.setStdgCd(addrInfo.string("STDG_CD")); + } + + } + } + return lsctAprvMapper.updateDriverInfo(driverInfo) == 1 ? true : false; } diff --git a/src/main/java/cokr/xit/fims/nxrp/web/NxrpController.java b/src/main/java/cokr/xit/fims/nxrp/web/NxrpController.java index b3a9796d..c6644090 100644 --- a/src/main/java/cokr/xit/fims/nxrp/web/NxrpController.java +++ b/src/main/java/cokr/xit/fims/nxrp/web/NxrpController.java @@ -178,7 +178,7 @@ public class NxrpController extends AbstractController { for(String nxrpSgg : nxrpSggs) { String sggCd = nxrpSgg; - File folder = new File("/files/temp/sendLcns/"+sggCd+"/"+ymd); + File folder = new File("files/temp/sendLcns/"+sggCd+"/"+ymd); File[] files = folder.listFiles(); for(File file : files) { nisIndivBean.send_DO_to_SI(file.getPath()); 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 03b939e3..7604a9b1 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 @@ -801,18 +801,8 @@ public class LsctMpngBean extends AbstractBean { lsctAprv.setHirerMblTelno(lsctMpngInfo.string("HIRER_MBL_TELNO")); // 임차인 휴대 전화번호 lsctAprv.setHirerEmlAddr(lsctMpngInfo.string("HIRER_EML_ADDR")); // 임차인 이메일 주소 - if(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")); // 임차인 우편번호 + if(!lsctMpngInfo.string("HIRER_ADDR").equals("")){ + 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")); // 도로 명 코드 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 d45afbb5..b2c44ba7 100644 --- a/src/main/resources/sql/mapper/fims/rent/lsctAprv-mapper.xml +++ b/src/main/resources/sql/mapper/fims/rent/lsctAprv-mapper.xml @@ -231,12 +231,9 @@ , HIRER_ZIP , HIRER_ADDR , HIRER_DTL_ADDR - , ROAD_NM_CD - , UDGD_SE_CD + , STDG_CD , BMNO , BSNO - , BLDG_MNG_NO - , STDG_CD , RENT_ENT_NM , RENT_ENT_REG_NO , RENT_ENT_TELNO @@ -304,12 +301,9 @@ , #{hirerZip} , #{hirerAddr} , #{hirerDtlAddr} - , #{roadNmCd} - , #{udgdSeCd} + , #{stdgCd} , (CASE WHEN #{bmno} = '' THEN NULL ELSE #{bmno} END) , (CASE WHEN #{bsno} = '' THEN NULL ELSE #{bsno} END) - , #{bldgMngNo} - , #{stdgCd} , #{rentEntNm} , #{rentEntRegNo} , #{rentEntTelno} @@ -368,12 +362,9 @@ , HIRER_ZIP = #{hirerZip} , HIRER_ADDR = #{hirerAddr} , HIRER_DTL_ADDR = #{hirerDtlAddr} - , ROAD_NM_CD = #{roadNmCd} - , UDGD_SE_CD = #{udgdSeCd} + , STDG_CD = #{stdgCd} , BMNO = #{bmno} , BSNO = #{bsno} - , BLDG_MNG_NO = #{bldgMngNo} - , STDG_CD = #{stdgCd} , RENT_ENT_NM = #{rentEntNm} , RENT_ENT_REG_NO = #{rentEntRegNo} , RENT_ENT_TELNO = #{rentEntTelno} @@ -437,6 +428,12 @@ , NPA_OM_JNO = #{npaOmJno} , 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) + , STDG_CD = (CASE WHEN HIRER_ADDR = '' OR HIRER_ADDR IS NULL THEN #{stdgCd} ELSE STDG_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) WHERE APRV_ID = #{aprvId} AND CHG_APRV_STTS_CD = 'RQ'