diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/floatingrates/data/FloatingRateData.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/floatingrates/data/FloatingRateData.java index 6adcd40b1..fe5b75986 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/floatingrates/data/FloatingRateData.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/floatingrates/data/FloatingRateData.java @@ -5,12 +5,12 @@ */ package org.mifosplatform.portfolio.floatingrates.data; -import java.util.Date; import java.util.List; import org.apache.commons.lang.builder.CompareToBuilder; import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; +import org.joda.time.LocalDate; import org.mifosplatform.infrastructure.core.data.EnumOptionData; public class FloatingRateData implements Comparable { @@ -20,16 +20,16 @@ public class FloatingRateData implements Comparable { private final boolean isBaseLendingRate; private final boolean isActive; private final String createdBy; - private final Date createdOn; + private final LocalDate createdOn; private final String modifiedBy; - private final Date modifiedOn; + private final LocalDate modifiedOn; private final List ratePeriods; @SuppressWarnings("unused") private final List interestRateFrequencyTypeOptions; public FloatingRateData(Long id, String name, boolean isBaseLendingRate, - boolean isActive, String createdBy, Date createdOn, - String modifiedBy, Date modifiedOn, + boolean isActive, String createdBy, LocalDate createdOn, + String modifiedBy, LocalDate modifiedOn, List ratePeriods, List interestRateFrequencyTypeOptions) { this.id = id; @@ -64,7 +64,7 @@ public class FloatingRateData implements Comparable { return this.createdBy; } - public Date getCreatedOn() { + public LocalDate getCreatedOn() { return this.createdOn; } @@ -72,7 +72,7 @@ public class FloatingRateData implements Comparable { return this.modifiedBy; } - public Date getModifiedOn() { + public LocalDate getModifiedOn() { return this.modifiedOn; } diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/floatingrates/data/FloatingRatePeriodData.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/floatingrates/data/FloatingRatePeriodData.java index ac997011e..8b874b06d 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/floatingrates/data/FloatingRatePeriodData.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/floatingrates/data/FloatingRatePeriodData.java @@ -6,7 +6,6 @@ package org.mifosplatform.portfolio.floatingrates.data; import java.math.BigDecimal; -import java.util.Date; import org.apache.commons.lang.builder.CompareToBuilder; import org.apache.commons.lang.builder.EqualsBuilder; @@ -17,19 +16,19 @@ public class FloatingRatePeriodData implements Comparable { private Long id; - private Date fromDate; + private LocalDate fromDate; private BigDecimal interestRate; private boolean isDifferentialToBaseLendingRate; private boolean isActive; private String createdBy; - private Date createdOn; + private LocalDate createdOn; private String modifiedBy; - private Date modifiedOn; + private LocalDate modifiedOn; - public FloatingRatePeriodData(Long id, Date fromDate, + public FloatingRatePeriodData(Long id, LocalDate fromDate, BigDecimal interestRate, boolean isDifferentialToBaseLendingRate, - boolean isActive, String createdBy, Date createdOn, - String modifiedBy, Date modifiedOn) { + boolean isActive, String createdBy, LocalDate createdOn, + String modifiedBy, LocalDate modifiedOn) { this.id = id; this.fromDate = fromDate; this.interestRate = interestRate; @@ -45,7 +44,7 @@ public class FloatingRatePeriodData implements return this.id; } - public Date getFromDate() { + public LocalDate getFromDate() { return this.fromDate; } @@ -69,7 +68,7 @@ public class FloatingRatePeriodData implements return this.createdBy; } - public Date getCreatedOn() { + public LocalDate getCreatedOn() { return this.createdOn; } @@ -77,7 +76,7 @@ public class FloatingRatePeriodData implements return this.modifiedBy; } - public Date getModifiedOn() { + public LocalDate getModifiedOn() { return this.modifiedOn; } diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/floatingrates/domain/FloatingRatePeriod.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/floatingrates/domain/FloatingRatePeriod.java index bfd721e5d..b0cc42f15 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/floatingrates/domain/FloatingRatePeriod.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/floatingrates/domain/FloatingRatePeriod.java @@ -15,6 +15,7 @@ import javax.persistence.ManyToOne; import javax.persistence.Table; import org.joda.time.LocalDate; +import org.joda.time.LocalDateTime; import org.mifosplatform.portfolio.floatingrates.data.FloatingRateDTO; import org.mifosplatform.portfolio.floatingrates.data.FloatingRatePeriodData; import org.mifosplatform.useradministration.domain.AppUser; @@ -136,11 +137,15 @@ public class FloatingRatePeriod extends AbstractPersistable { interest = interest.add(floatingRateDTO .fetchBaseRate(fetchFromDate())); } - - return new FloatingRatePeriodData(getId(), getFromDate(), interest, + + final LocalDate fromDate = new LocalDateTime(getFromDate()).toLocalDate(); + final LocalDate createdOn = new LocalDateTime(getCreatedOn()).toLocalDate(); + final LocalDate modidiedOn = new LocalDateTime(getModifiedOn()).toLocalDate(); + + return new FloatingRatePeriodData(getId(), fromDate, interest, isDifferentialToBaseLendingRate(), isActive(), getCreatedBy() - .getUsername(), getCreatedOn(), getModifiedBy() - .getUsername(), getModifiedOn()); + .getUsername(), createdOn, getModifiedBy() + .getUsername(), modidiedOn); } } diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/floatingrates/service/FloatingRatesReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/floatingrates/service/FloatingRatesReadPlatformServiceImpl.java index 6e125b85a..3aea6f10e 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/floatingrates/service/FloatingRatesReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/floatingrates/service/FloatingRatesReadPlatformServiceImpl.java @@ -11,6 +11,8 @@ import java.sql.SQLException; import java.util.Date; import java.util.List; +import org.joda.time.LocalDate; +import org.mifosplatform.infrastructure.core.domain.JdbcSupport; import org.mifosplatform.infrastructure.core.service.RoutingDataSource; import org.mifosplatform.portfolio.floatingrates.data.FloatingRateData; import org.mifosplatform.portfolio.floatingrates.data.FloatingRatePeriodData; @@ -128,9 +130,9 @@ public class FloatingRatesReadPlatformServiceImpl implements .getBoolean("isBaseLendingRate"); final boolean isActive = rs.getBoolean("isActive"); final String createdBy = rs.getString("createdBy"); - final Date createdOn = rs.getDate("createdOn"); + final LocalDate createdOn = JdbcSupport.getLocalDate(rs, "createdOn"); final String modifiedBy = rs.getString("modifiedBy"); - final Date modifiedOn = rs.getDate("modifiedOn"); + final LocalDate modifiedOn = JdbcSupport.getLocalDate(rs, "modifiedOn"); List ratePeriods = null; if (addRatePeriods) { FloatingRatePeriodRowMapper ratePeriodMapper = new FloatingRatePeriodRowMapper(); @@ -173,15 +175,15 @@ public class FloatingRatesReadPlatformServiceImpl implements @SuppressWarnings("unused") final int rowNum) throws SQLException { final Long id = rs.getLong("id"); - final Date fromDate = rs.getDate("fromDate"); + final LocalDate fromDate = JdbcSupport.getLocalDate(rs, "fromDate"); final BigDecimal interestRate = rs.getBigDecimal("interestRate"); final boolean isDifferentialToBaseLendingRate = rs .getBoolean("isDifferentialToBaseLendingRate"); final boolean isActive = rs.getBoolean("isActive"); final String createdBy = rs.getString("createdBy"); - final Date createdOn = rs.getDate("createdOn"); + final LocalDate createdOn = JdbcSupport.getLocalDate(rs, "createdOn"); final String modifiedBy = rs.getString("modifiedBy"); - final Date modifiedOn = rs.getDate("modifiedOn"); + final LocalDate modifiedOn = JdbcSupport.getLocalDate(rs, "modifiedOn"); return new FloatingRatePeriodData(id, fromDate, interestRate, isDifferentialToBaseLendingRate, isActive, createdBy, createdOn, modifiedBy, modifiedOn);