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 d7287ad1..e66710a2 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 @@ -308,6 +308,8 @@ public class SnisBean extends ScheduledBean { private void update(Ye22NoticeInfoDTO notice, Levy levy) { if (notice == null || levy == null) return; + boolean chenap = "체납".equals(notice.getBuStatusNm()); + // levy.setSggCd(notice.getSiguCd()); // 시군구 코드 levy.setDeptCd(notice.getBuseoCd()); // 부서코드 @@ -318,9 +320,9 @@ public class SnisBean extends ScheduledBean { levy.setLevyYmd(notice.getTaxYmd()); // 부과일자 levy.setDudtYmd(notice.getNapgiYmd()); // 납기일자 - int taxAmt = (int)notice.getTaxAmt(); + int taxAmt = !chenap ? (int)notice.getTaxAmt() : (int)notice.getCheAmt(); levy.setLevyPcptax(taxAmt); // 부과본세 <- 과세금액 - int gasanAmt = (int)notice.gasanAmt(); + int gasanAmt = !chenap ? (int)notice.gasanAmt() : (int)notice.chenapGasanAmt(); levy.setLevyAdamt(gasanAmt); // 부과가산금 levy.setDudtAftrAmt(null); /* @@ -344,6 +346,8 @@ public class SnisBean extends ScheduledBean { private void update(Ye22NoticeInfoDTO notice, SndngDtl sndngDtl) { if (notice == null || sndngDtl == null) return; + boolean chenap = "체납".equals(notice.getBuStatusNm()); + sndngDtl.setSggCd(notice.getSiguCd()); // 시군구 코드 sndngDtl.setTaxNo(notice.getNapseNo()); // 납세번호 sndngDtl.setEpayno(notice.getEnapbuNo()); // 전자납부번호 @@ -355,8 +359,8 @@ public class SnisBean extends ScheduledBean { sndngDtl.setDudtYmd(notice.getNapgiYmd()); // 납기일자 sndngDtl.setDudtAftrYmd(notice.getNapgiAftYmd()); // 납기후일자 - sndngDtl.setPcptax((int)notice.getTaxAmt()); // 본세 - sndngDtl.setAdamt((int)notice.gasanAmt()); // 가산금 + sndngDtl.setPcptax(!chenap ? (int)notice.getTaxAmt() : (int)notice.getCheAmt()); // 본세 + sndngDtl.setAdamt(!chenap ? (int)notice.gasanAmt() : (int)notice.chenapGasanAmt());// 가산금 sndngDtl.setLastAmt((int)notice.totalAmt()); // 최종금액 sndngDtl.setDudtAftrAmt(null); // 납기후 금액 @@ -369,7 +373,7 @@ public class SnisBean extends ScheduledBean { log().debug("Ye22NoticeInfoDTO(s) received: {}", !isEmpty(notices) ? notices.size() : 0); // 상태가 부과,완납,감면,전액감액,신고종료인 것들만 처리 notices = !isEmpty(notices) ? - notices.stream().filter(notice -> "부과,완납,감면,전액감액,신고종료".contains(notice.getBuStatusNm())).toList() : + notices.stream().filter(notice -> "부과,완납,체납,감면,전액감액,신고종료".contains(notice.getBuStatusNm())).toList() : Collections.emptyList(); if (isEmpty(notices)) return; @@ -456,10 +460,8 @@ public class SnisBean extends ScheduledBean { public void getPreNotices() { log().debug("Starting getPreNotices()..."); - List list = sndngDtlMapper.selectSndngDtlsToSync(); - for (SndngDtl sndngDtl: list) { + for (SndngDtl sndngDtl: sndngDtlMapper.selectSndngDtlsToSync()) getPreNoticeList(sndngDtl); - } } /**과태료 대장 단속 정보 등록 정보를 등록한다.