diff --git a/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/ComparisonServiceImpl.java b/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/ComparisonServiceImpl.java index 401ad46..f4de64c 100644 --- a/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/ComparisonServiceImpl.java +++ b/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/ComparisonServiceImpl.java @@ -68,40 +68,42 @@ public class ComparisonServiceImpl extends EgovAbstractServiceImpl implements Co return productUseChangeResult; } - // ========== 3. 내사종결 체크 - 명의이전 이전소유자 상품용, 31일 이내 ========== + // ========== 3. 이첩 체크 ========== + String transferResult = transferCase115DayChecker.check(existingData, userOrgCd); + if (transferResult != null) { + log.info("========== 비교 로직 종료 (이첩): {} ==========", vhclno); + return transferResult; + } + + // ========== 4. 내사종결 체크 - 명의이전 이전소유자 상품용, 31일 이내 ========== String investigationClosedByProductResult = productCloseWithin31Checker.check(existingData, userOrgCd); if (investigationClosedByProductResult != null) { log.info("========== 비교 로직 종료 (내사종결 - 명의이전 이전소유자 상품용, 31일 이내): {} ==========", vhclno); return investigationClosedByProductResult; } - // ========== 4. 내사종결 체크 - 명의이전, 31일 이내 ========== + // ========== 5. 내사종결 체크 - 명의이전, 31일 이내 ========== String investigationClosedByOwnerChangeResult = ownerCloseWithin31Checker.check(existingData, userOrgCd); if (investigationClosedByOwnerChangeResult != null) { log.info("========== 비교 로직 종료 (내사종결 - 명의이전, 31일 이내): {} ==========", vhclno); return investigationClosedByOwnerChangeResult; } - // ========== 5. 날짜 수정 후 부과 체크 - 명의이전 이전소유자 상품용, 31일 초과 ========== + // ========== 6. 날짜 수정 후 부과 체크 - 명의이전 이전소유자 상품용, 31일 초과 ========== String dateModifiedLevyByProductResult = productLevyOver31Checker.check(existingData, userOrgCd); if (dateModifiedLevyByProductResult != null) { log.info("========== 비교 로직 종료 (날짜 수정 후 부과 - 명의이전 이전소유자, 31일 초과): {} ==========", vhclno); return dateModifiedLevyByProductResult; } - // ========== 6. 날짜 수정 후 부과 체크 - 명의이전, 31일 초과 ========== + // ========== 7. 날짜 수정 후 부과 체크 - 명의이전, 31일 초과 ========== String dateModifiedLevyByOwnerChangeOverResult = ownerLevyOver31Checker.check(existingData, userOrgCd); if (dateModifiedLevyByOwnerChangeOverResult != null) { log.info("========== 비교 로직 종료 (날짜 수정 후 부과 - 명의이전, 31일 초과): {} ==========", vhclno); return dateModifiedLevyByOwnerChangeOverResult; } - // ========== 7. 이첩 체크 ========== - String transferResult = transferCase115DayChecker.check(existingData, userOrgCd); - if (transferResult != null) { - log.info("========== 비교 로직 종료 (이첩): {} ==========", vhclno); - return transferResult; - } + log.info("========== 비교 로직 종료 (미적용): {} ==========", vhclno); return null; diff --git a/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/OwnerCloseWithin31Checker.java b/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/OwnerCloseWithin31Checker.java index 37b9efa..08ca6be 100644 --- a/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/OwnerCloseWithin31Checker.java +++ b/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/OwnerCloseWithin31Checker.java @@ -38,9 +38,9 @@ public class OwnerCloseWithin31Checker extends AbstractComparisonChecker { @Override public String check(CarFfnlgTrgtVO existingData, String userOrgCd) { String vhclno = existingData.getVhclno(); - String inspYmd = existingData.getInspYmd(); - String vldPrdExpryYmd = existingData.getVldPrdExpryYmd(); - String inspEndYmd = existingData.getInspEndYmd(); + String inspYmd = existingData.getInspYmd().replace("-", ""); + String vldPrdExpryYmd = existingData.getVldPrdExpryYmd().replace("-", ""); + String inspEndYmd = existingData.getInspEndYmd().replace("-", ""); try { // ========== Step 1: 자동차기본정보 조회 (차량번호, 부과일자=검사일) ========== @@ -223,7 +223,7 @@ public class OwnerCloseWithin31Checker extends AbstractComparisonChecker { existingData.setCarBscMttrInqFlnm(step4OwnerName); existingData.setCarRegFrmbkChgTaskSeCd(targetRecord.getChgTaskSeCd()); existingData.setCarRegFrmbkChgTaskSeNm(targetRecord.getChgTaskSeNm()); - existingData.setCarRegFrmbkChgYmd(targetRecord.getChgYmd().replace("-", "")); + existingData.setCarRegFrmbkChgYmd(targetRecord.getChgYmd()); existingData.setCarRegFrmbkDtl(ComparisonRemarkBuilder.buildLedgerRecordDetail(targetRecord)); existingData.setRmrk(rmrk); existingData.setRmrkDtl(rmrkDtl); diff --git a/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/OwnerLevyOver31Checker.java b/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/OwnerLevyOver31Checker.java index 7863467..6d91f52 100644 --- a/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/OwnerLevyOver31Checker.java +++ b/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/OwnerLevyOver31Checker.java @@ -38,9 +38,9 @@ public class OwnerLevyOver31Checker extends AbstractComparisonChecker { @Override public String check(CarFfnlgTrgtVO existingData, String userOrgCd) { String vhclno = existingData.getVhclno(); - String inspYmd = existingData.getInspYmd(); - String vldPrdExpryYmd = existingData.getVldPrdExpryYmd(); - String inspEndYmd = existingData.getInspEndYmd(); + String inspYmd = existingData.getInspYmd().replace("-", ""); + String vldPrdExpryYmd = existingData.getVldPrdExpryYmd().replace("-", ""); + String inspEndYmd = existingData.getInspEndYmd().replace("-", ""); try { // ========== Step 1: 자동차기본정보 조회 (차량번호, 부과일자=검사일) ========== @@ -223,7 +223,7 @@ public class OwnerLevyOver31Checker extends AbstractComparisonChecker { existingData.setCarBscMttrInqFlnm(step4OwnerName); existingData.setCarRegFrmbkChgTaskSeCd(targetRecord.getChgTaskSeCd()); existingData.setCarRegFrmbkChgTaskSeNm(targetRecord.getChgTaskSeNm()); - existingData.setCarRegFrmbkChgYmd(targetRecord.getChgYmd().replace("-", "")); + existingData.setCarRegFrmbkChgYmd(targetRecord.getChgYmd()); existingData.setCarRegFrmbkDtl(ComparisonRemarkBuilder.buildLedgerRecordDetail(targetRecord)); existingData.setRmrk(rmrk); existingData.setRmrkDtl(rmrkDtl); diff --git a/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/ProductCloseWithin31Checker.java b/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/ProductCloseWithin31Checker.java index e74305a..e85ffea 100644 --- a/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/ProductCloseWithin31Checker.java +++ b/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/ProductCloseWithin31Checker.java @@ -38,9 +38,9 @@ public class ProductCloseWithin31Checker extends AbstractComparisonChecker { @Override public String check(CarFfnlgTrgtVO existingData, String userOrgCd) { String vhclno = existingData.getVhclno(); - String inspYmd = existingData.getInspYmd(); - String vldPrdExpryYmd = existingData.getVldPrdExpryYmd(); - String inspEndYmd = existingData.getInspEndYmd(); + String inspYmd = existingData.getInspYmd().replace("-", ""); + String vldPrdExpryYmd = existingData.getVldPrdExpryYmd().replace("-", ""); + String inspEndYmd = existingData.getInspEndYmd().replace("-", ""); try { // ========== Step 1: 자동차기본정보 조회 (차량번호, 부과일자=검사일) ========== @@ -223,7 +223,7 @@ public class ProductCloseWithin31Checker extends AbstractComparisonChecker { existingData.setCarBscMttrInqFlnm(step4OwnerName); existingData.setCarRegFrmbkChgTaskSeCd(targetRecord.getChgTaskSeCd()); existingData.setCarRegFrmbkChgTaskSeNm(targetRecord.getChgTaskSeNm()); - existingData.setCarRegFrmbkChgYmd(targetRecord.getChgYmd().replace("-", "")); + existingData.setCarRegFrmbkChgYmd(targetRecord.getChgYmd()); existingData.setCarRegFrmbkDtl(ComparisonRemarkBuilder.buildLedgerRecordDetail(targetRecord)); existingData.setRmrk(rmrk); existingData.setRmrkDtl(rmrkDtl); diff --git a/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/ProductLevyOver31Checker.java b/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/ProductLevyOver31Checker.java index afb6426..7d18d24 100644 --- a/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/ProductLevyOver31Checker.java +++ b/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/ProductLevyOver31Checker.java @@ -38,9 +38,9 @@ public class ProductLevyOver31Checker extends AbstractComparisonChecker { @Override public String check(CarFfnlgTrgtVO existingData, String userOrgCd) { String vhclno = existingData.getVhclno(); - String inspYmd = existingData.getInspYmd(); - String vldPrdExpryYmd = existingData.getVldPrdExpryYmd(); - String inspEndYmd = existingData.getInspEndYmd(); + String inspYmd = existingData.getInspYmd().replace("-", ""); + String vldPrdExpryYmd = existingData.getVldPrdExpryYmd().replace("-", ""); + String inspEndYmd = existingData.getInspEndYmd().replace("-", ""); try { // ========== Step 1: 자동차기본정보 조회 (차량번호, 부과일자=검사일) ========== @@ -225,7 +225,7 @@ public class ProductLevyOver31Checker extends AbstractComparisonChecker { existingData.setCarBscMttrInqFlnm(step4OwnerName); existingData.setCarRegFrmbkChgTaskSeCd(targetRecord.getChgTaskSeCd()); existingData.setCarRegFrmbkChgTaskSeNm(targetRecord.getChgTaskSeNm()); - existingData.setCarRegFrmbkChgYmd(targetRecord.getChgYmd().replace("-", "")); + existingData.setCarRegFrmbkChgYmd(targetRecord.getChgYmd()); existingData.setCarRegFrmbkDtl(ComparisonRemarkBuilder.buildLedgerRecordDetail(targetRecord)); existingData.setRmrk(rmrk); existingData.setRmrkDtl(rmrkDtl); diff --git a/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/ProductUseChecker.java b/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/ProductUseChecker.java index 5ab6b9e..bd4d79a 100644 --- a/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/ProductUseChecker.java +++ b/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/ProductUseChecker.java @@ -38,9 +38,9 @@ public class ProductUseChecker extends AbstractComparisonChecker { @Override public String check(CarFfnlgTrgtVO existingData, String userOrgCd) { String vhclno = existingData.getVhclno(); - String inspYmd = existingData.getInspYmd(); - String vldPrdExpryYmd = existingData.getVldPrdExpryYmd(); - String inspEndYmd = existingData.getInspEndYmd(); + String inspYmd = existingData.getInspYmd().replace("-", ""); + String vldPrdExpryYmd = existingData.getVldPrdExpryYmd().replace("-", ""); + String inspEndYmd = existingData.getInspEndYmd().replace("-", ""); try { // ========== Step 1: 자동차기본정보 조회 (차량번호, 부과일자=검사일) ========== @@ -217,7 +217,7 @@ public class ProductUseChecker extends AbstractComparisonChecker { existingData.setCarBscMttrInqFlnm(step4OwnerName); existingData.setCarRegFrmbkChgTaskSeCd(targetRecord.getChgTaskSeCd()); existingData.setCarRegFrmbkChgTaskSeNm(targetRecord.getChgTaskSeNm()); - existingData.setCarRegFrmbkChgYmd(targetRecord.getChgYmd().replace("-", "")); + existingData.setCarRegFrmbkChgYmd(targetRecord.getChgYmd()); existingData.setCarRegFrmbkDtl(ComparisonRemarkBuilder.buildLedgerRecordDetail(targetRecord)); existingData.setRmrk(rmrk); existingData.setRmrkDtl(rmrkDtl); diff --git a/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/ProductUseChnageChecker.java b/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/ProductUseChnageChecker.java index 6437e1e..3862119 100644 --- a/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/ProductUseChnageChecker.java +++ b/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/ProductUseChnageChecker.java @@ -38,9 +38,9 @@ public class ProductUseChnageChecker extends AbstractComparisonChecker { @Override public String check(CarFfnlgTrgtVO existingData, String userOrgCd) { String vhclno = existingData.getVhclno(); - String inspYmd = existingData.getInspYmd(); - String vldPrdExpryYmd = existingData.getVldPrdExpryYmd(); - String inspEndYmd = existingData.getInspEndYmd(); + String inspYmd = existingData.getInspYmd().replace("-", ""); + String vldPrdExpryYmd = existingData.getVldPrdExpryYmd().replace("-", ""); + String inspEndYmd = existingData.getInspEndYmd().replace("-", ""); try { // ========== Step 1: 자동차기본정보 조회 (차량번호, 부과일자=검사일) ========== @@ -222,7 +222,7 @@ public class ProductUseChnageChecker extends AbstractComparisonChecker { existingData.setCarBscMttrInqFlnm(step4OwnerName); existingData.setCarRegFrmbkChgTaskSeCd(targetRecord.getChgTaskSeCd()); existingData.setCarRegFrmbkChgTaskSeNm(targetRecord.getChgTaskSeNm()); - existingData.setCarRegFrmbkChgYmd(targetRecord.getChgYmd().replace("-", "")); + existingData.setCarRegFrmbkChgYmd(targetRecord.getChgYmd()); existingData.setCarRegFrmbkDtl(ComparisonRemarkBuilder.buildLedgerRecordDetail(targetRecord)); existingData.setRmrk(rmrk); existingData.setRmrkDtl(rmrkDtl); diff --git a/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/TransferCase115DayChecker.java b/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/TransferCase115DayChecker.java index c68de34..ebaac73 100644 --- a/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/TransferCase115DayChecker.java +++ b/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/TransferCase115DayChecker.java @@ -53,7 +53,7 @@ public class TransferCase115DayChecker extends AbstractComparisonChecker { if (daycnt > 115) { // 이첩-2: 부과기준일 = 검사종료일자 + 115일 - String inspEndYmd = existingData.getInspEndYmd(); + String inspEndYmd = existingData.getInspEndYmd().replace("-", ""); LocalDate inspEndDate = DateUtil.parseDate(inspEndYmd); LocalDate levyCrtrDate = inspEndDate.plusDays(115); levyCrtrYmd = levyCrtrDate.format(DATE_FORMATTER); @@ -61,7 +61,7 @@ public class TransferCase115DayChecker extends AbstractComparisonChecker { log.info("[이첩-2] 부과기준일 = 검사종료일자({}) + 115일 = {}", inspEndYmd, levyCrtrYmd); } else { // 이첩-1: 부과기준일 = 검사일자 - levyCrtrYmd = existingData.getInspYmd(); + levyCrtrYmd = existingData.getInspYmd().replace("-", ""); transferType = "이첩-1"; log.info("[이첩-1] 부과기준일 = 검사일자 = {}", levyCrtrYmd); }