diff --git a/src/main/java/cokr/xit/fims/nxrp/service/bean/SnisBean.java b/src/main/java/cokr/xit/fims/nxrp/service/bean/SnisBean.java index 10e841bf..444fd93a 100644 --- a/src/main/java/cokr/xit/fims/nxrp/service/bean/SnisBean.java +++ b/src/main/java/cokr/xit/fims/nxrp/service/bean/SnisBean.java @@ -370,12 +370,12 @@ public class SnisBean extends AbstractBean { boolean bugwa = notices.stream() .filter(notice -> "0".equals(notice.getBuStatusCd())) .count() > 0; - // 세외수입 연계키별 발송상세 정보 + // 단속ID별 발송상세 정보 List sndngDtls = !bugwa ? Collections.emptyList() : sndngDtlMapper.selectSndngDetails(new SndbQuery().setCrdnIds(crdnIDs.toArray(new String[crdnIDs.size()]))); Map sndngDetails = sndngDtls.stream().collect(Collectors.toMap( - SndngDtl::getLinkMngKey, + SndngDtl::getCrdnId, sndngDtl -> sndngDtl )); @@ -386,17 +386,9 @@ public class SnisBean extends AbstractBean { int rcvmtAmt = (int)notice.totalAmt(); log().debug("세외수입 연계키: {}, 상태: {}", linkMngKey, status); - if (bugwa) { - SndngDtl sndngDtl = sndngDetails.get(linkMngKey); - update(notice, sndngDtl); // 발송상세에 적용 - if (sndngDtl != null) - sndngDtlMapper.updateSndngDtl(sndngDtl); - } - Levy levy = levies.get(linkMngKey); update(notice, levy); // 부과정보에 적용 - if (levy != null) - levyMapper.updateLevy(levy); + levyMapper.updateLevy(levy); if (paidFull) { Rcvmt rcvmt = new Rcvmt(); // 수납등록 @@ -405,7 +397,15 @@ public class SnisBean extends AbstractBean { rcvmtBean.createRcvmt(rcvmt); } - Crdn crdn = crdns.get(levy.getCrdnId()); + String crdnId = levy.getCrdnId(); + if (bugwa) { + SndngDtl sndngDtl = sndngDetails.get(crdnId); + update(notice, sndngDtl); // 발송상세에 적용 + if (sndngDtl != null) + sndngDtlMapper.updateSndngDtl(sndngDtl); + } + + Crdn crdn = crdns.get(crdnId); if (crdn == null) continue; String crdnStatus = crdn.getCrdnSttsCd();