diff --git a/src/main/java/cokr/xit/fims/levy/LevyQuery.java b/src/main/java/cokr/xit/fims/levy/LevyQuery.java index 0f97a1cd..60372940 100644 --- a/src/main/java/cokr/xit/fims/levy/LevyQuery.java +++ b/src/main/java/cokr/xit/fims/levy/LevyQuery.java @@ -1,5 +1,7 @@ package cokr.xit.fims.levy; +import java.util.List; + import cokr.xit.fims.cmmn.CmmnQuery; /**과태료 부과 대장 정보 조회 요청 @@ -23,6 +25,7 @@ public class LevyQuery extends CmmnQuery { private String levyId; // 부과 ID private String[] rdctIds; // 감경 Ids private String rdctId; // 감경 ID + private List nxrpLevyKeys; // 세외수입 부과키 // 검색 조건 private String schFyr; // 회계연도 private String schLevyNoFrom; // 부과 번호 시작 @@ -123,6 +126,15 @@ public class LevyQuery extends CmmnQuery { return self(); } + public List getNxrpLevyKeys() { + return ifEmpty(nxrpLevyKeys, () -> null); + } + + public T setNxrpLevyKeys(List nxrpLevyKeys) { + this.nxrpLevyKeys = nxrpLevyKeys; + return self(); + } + // 검색 조건 ////////////////////////////////////////////////////////////////// public String getSchRdctYmdFrom() { return ifEmpty(schRdctYmdFrom, () -> null); 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 b7f034ba..bf19562d 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 @@ -286,7 +286,7 @@ public class SnisBean extends AbstractBean { notice -> notice )); List nxrpLevyKeys = noticeMap.keySet().stream().toList(); - List levies = levyMapper.selectLevys(new LevyQuery()); + List levies = levyMapper.selectLevys(new LevyQuery().setNxrpLevyKeys(nxrpLevyKeys)); levies.forEach(levy -> { Ye22NoticeInfoDTO notice = noticeMap.get(levy.getNxrpLevyKey()); if (notice == null) return; @@ -310,7 +310,7 @@ public class SnisBean extends AbstractBean { levy.setSzrYmd(notice.getApYmd()); // 압류일자 levy.setEpayno(notice.getEnapbuNo()); // 전자납부번호 - levy.setNxrpLevyKey(Long.toString(notice.getBuAk())); // 세외수입 부과키 +// levy.setNxrpLevyKey(Long.toString(notice.getBuAk())); // 세외수입 부과키 setBankAccounts(notice.accountGetters(), levy.bankAccountSetters()); // 은행 / 계좌번호 }); diff --git a/src/main/resources/sql/mapper/fims/levy/levy-mapper.xml b/src/main/resources/sql/mapper/fims/levy/levy-mapper.xml index 846248e6..02e93b3e 100644 --- a/src/main/resources/sql/mapper/fims/levy/levy-mapper.xml +++ b/src/main/resources/sql/mapper/fims/levy/levy-mapper.xml @@ -602,6 +602,7 @@ AND C.CRDN_ID = #{crdnId} AND C.DEL_YN = 'N' + AND L.NXRP_LEVY_KEY IN (#{nxrpLevyKey})