diff --git a/src/main/java/ru/nbch/credit_tracker/mapper/indic/FlagsMapper.java b/src/main/java/ru/nbch/credit_tracker/mapper/indic/FlagsMapper.java index ecbce5f..3ab6e2b 100644 --- a/src/main/java/ru/nbch/credit_tracker/mapper/indic/FlagsMapper.java +++ b/src/main/java/ru/nbch/credit_tracker/mapper/indic/FlagsMapper.java @@ -16,21 +16,12 @@ public interface FlagsMapper { List findFlag90ByRuPaymt(@Param("fids") List fids, @Param("reportedDate") LocalDate reportedDate); - List findFlagsDebt5000Old(@Param("fids") List fids); - - List findFlag90ByPastDueArrearOld(@Param("fids") List fids, @Param("reportedDate") LocalDate reportedDate); - - List findFlag90ByRuPaymtOld(@Param("fids") List fids, @Param("reportedDate") LocalDate reportedDate); - - List findFlagsDebt5000New(@Param("fids") List fids); List findFlagsDebt5000NewWithOrderBy(@Param("fids") List fids); - List findFlag90ByPastDueArrearNew(@Param("fids") List fids, @Param("reportedDate") LocalDate reportedDate); List findFlag90ByPastDueArrearNewWithOrderBy(@Param("fids") List fids); - List findFlag90ByRuPaymtNew(@Param("fids") List fids, @Param("reportedDate") LocalDate reportedDate); List findFlag90ByRuPaymtNewWithOrderBy(@Param("fids") List fids); } diff --git a/src/main/java/ru/nbch/credit_tracker/service/indic/FlagsService.java b/src/main/java/ru/nbch/credit_tracker/service/indic/FlagsService.java index 17a6924..783ec5c 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/indic/FlagsService.java +++ b/src/main/java/ru/nbch/credit_tracker/service/indic/FlagsService.java @@ -72,12 +72,6 @@ public class FlagsService { } private void calcFlag500Test(List fids) { - log.debug("Start findFlagsDebt5000Old"); - mapper.findFlagsDebt5000Old(fids); - log.debug("Complete findFlagsDebt5000Old"); - log.debug("Start findFlagsDebt5000New"); - mapper.findFlagsDebt5000New(fids); - log.debug("Complete findFlagsDebt5000New"); log.debug("Start findFlagsDebt5000NewWithOrderBy"); mapper.findFlagsDebt5000NewWithOrderBy(fids); log.debug("Complete findFlagsDebt5000NewWithOrderBy"); @@ -98,13 +92,6 @@ public class FlagsService { } private void calcFlag90DaysByPastDueArrearTest(List fids) { - LocalDate yearAgo = LocalDate.now().minusYears(1); - log.debug("Start findFlag90ByPastDueArrearOld"); - mapper.findFlag90ByPastDueArrearOld(fids, yearAgo); - log.debug("Complete findFlag90ByPastDueArrearOld"); - log.debug("Start findFlag90ByPastDueArrearNew"); - mapper.findFlag90ByPastDueArrearNew(fids, yearAgo); - log.debug("Complete findFlag90ByPastDueArrearNew"); log.debug("Start findFlag90ByPastDueArrearNewWithOrderBy"); mapper.findFlag90ByPastDueArrearNewWithOrderBy(fids); log.debug("Complete findFlag90ByPastDueArrearNewWithOrderBy"); @@ -120,13 +107,6 @@ public class FlagsService { } private void calcFlag90DaysByRuPaymtTest(List fids) { - LocalDate yearAgo = LocalDate.now().minusYears(1); - log.debug("Start findFlag90ByRuPaymtOld"); - mapper.findFlag90ByRuPaymtOld(fids,yearAgo); - log.debug("Complete findFlag90ByRuPaymtOld"); - log.debug("Start findFlag90ByRuPaymtNew"); - mapper.findFlag90ByRuPaymtNew(fids, yearAgo); - log.debug("Complete findFlag90ByRuPaymtNew"); log.debug("Start findFlag90ByRuPaymtNewWithOrderBy"); mapper.findFlag90ByRuPaymtNewWithOrderBy(fids); log.debug("Complete findFlag90ByRuPaymtNewWithOrderBy"); diff --git a/src/main/resources/mybatis/mapper/indic/FlagsMapper.xml b/src/main/resources/mybatis/mapper/indic/FlagsMapper.xml index 410ab04..4ad119e 100644 --- a/src/main/resources/mybatis/mapper/indic/FlagsMapper.xml +++ b/src/main/resources/mybatis/mapper/indic/FlagsMapper.xml @@ -171,7 +171,7 @@ #{fid} - ORDER BY FID, ACC_SERIAL_NUM, REPORTED_DT DESC + ORDER BY FID DESC with UR @@ -199,7 +199,7 @@ #{fid} - ORDER BY FID, REPORTED_DT DESC + ORDER BY FID DESC WITH UR @@ -221,7 +221,7 @@ #{fid} - ORDER BY FID, REPORTED_DT DESC + ORDER BY FID DESC WITH UR